Changeset 532 for trunk/Common

Timestamp:

Apr 24, 2013, 9:09:32 PM (12 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.

Location:

trunk/Common

Files:

• EmailQueue.php (modified) (1 diff)
• Global.php (modified) (1 diff)
• Page.php (modified) (5 diffs)
• RSS.php (modified) (1 diff)
• Version.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);
-    }
-  }
-  
-  ?>
+?>

trunk/Common/Global.php

@@ -150 +150 @@
 }
 
-// Zobrazení číselný seznamu stránek
+// Show page listing numbers
 function PagesList($URL, $Page, $TotalCount, $CountPerPage)
 {

trunk/Common/Page.php

@@ -16 +16 @@
   function __construct($System)
   {
-    global $Config;
-    
     parent::__construct($System);
     
-    $this->FormatHTML = $Config['Web']['FormatHTML'];
-    $this->ShowRuntimeInfo = $Config['Web']['ShowRuntimeInfo'];
+    $this->FormatHTML = $this->System->Config['Web']['FormatHTML'];
+    $this->ShowRuntimeInfo = $this->System->Config['Web']['ShowRuntimeInfo'];
   }
 
@@ -76 +74 @@
           else $Output .= $this->System->User->User['Name'].' <a href="'.$this->System->Link('/?Action=Logout').'">Odhlásit</a>';
      } else $Output .= '&nbsp;';
-//   <a href="'.$this->System->Config['Web']['RootFolder'].'/?Action=UserOptions">Nastavení</a>'; 
+//   <a href="'.$this->System->Link('/?Action=UserOptions').'">Nastavení</a>'; 
       $Output .= '</div></div>';
     }
@@ -91 +89 @@
       $Output .= '<div id="Footer">
      <i>| Správa webu: '.$this->System->Config['Web']['Admin'].' | e-mail: '.$this->System->Config['Web']['AdminEmail'].' |';
-      if($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
+      if($this->ShowRuntimeInfo == true) $Output .= ' Doba generování: '.$Time.' s / '.ini_get('max_execution_time').
+        ' s | Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B |';
       $Output .= '</i></div>';
     }
@@ -99 +98 @@
 
   function GetOutput()
-  { 
-    $Output = $this->Show();
+  {
+    try {
+      $Output = $this->Show();
+    } catch (Exception $E) {
+      $Output = 'Chyba: '.$E->getMessage();
+    }
     if($this->ClearPage == false) 
     {
@@ -119 +122 @@
   }
 
-  // Funkce formatovani vystupu
+  // XML formating function
   function FormatOutput($s)
   {

trunk/Common/RSS.php

@@ -16 +16 @@
   }
 
-  function Generate($Data)
+  function Generate()
   { 
     $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?

trunk/Common/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 531; // Subversion revision
+$Revision = 532; // Subversion revision
 $DatabaseRevision = 527; // SQL structure revision
-$ReleaseTime = '2013-04-23';
+$ReleaseTime = '2013-04-24';
 
 ?>