Changeset 375 for trunk

Timestamp:

Jan 20, 2012, 7:46:05 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Generování RSS formátu přepracováno na třídu.

Location:

trunk

Files:

• Common/RSS.php (modified) (1 diff)
• Modules/Finance/Manage.php (modified) (1 diff)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/News/NewsPage.php (modified) (1 diff)

trunk/Common/RSS.php

@@ -1 +1 @@
 <?php
 
-function GenerateRSS($Data)
+class RSS 
 {
-  global $Config;
+  var $Charset;
+  var $Title;
+  var $Link;
+  var $Description;
+  var $WebmasterEmail;
+  var $Items;
   
-  $Result = '<?xml version="1.0" encoding="'.$Config['Web']['Charset'].'" ?>'."\n". //<?
+  function __construct()
+  {
+    $this->Charset = 'utf8';
+    $this->Items = array();
+  }
+
+  function Generate($Data)
+  { 
+    $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?
   '<rss version="2.0">'."\n".
   "  <channel>\n".
-  "    <title>".$Data['Title']."</title>\n".
-  "    <link>".$Data['Link']."</link>\n".
-  "    <description>".$Data['Description']."</description>\n".
+  "    <title>".$this->Title."</title>\n".
+  "    <link>".$this->Link."</link>\n".
+  "    <description>".$this->Description."</description>\n".
   "    <language>cs</language>\n".
-  "    <webMaster>".$Data['WebmasterEmail']."</webMaster>\n".
+  "    <webMaster>".$this->WebmasterEmail."</webMaster>\n".
   "    <pubDate>".date('r')."</pubDate>\n".  
   "    <ttl>20</ttl>\n";
-  foreach($Data['Items'] as $Item)
-  {
-    $Result .= "    <item>\n".
-    '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
-    '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
-          '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
-          '      <link>'.$Item['Link']."</link>\n".
-    "    </item>\n";
+    foreach($this->Items as $Item)
+    {
+      $Result .= "    <item>\n".
+        '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
+        '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
+        '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
+        '      <link>'.$Item['Link']."</link>\n".
+        "    </item>\n";
+    }
+    $Result .= "  </channel>\n".
+    "</rss>";
+    return($Result);
   }
-  $Result .= "  </channel>\n".
-  "</rss>";
-  return($Result);
 }
 

trunk/Modules/Finance/Manage.php

@@ -409 +409 @@
     {
       $Title = 'Pravidelné vyúčtování služeb';
+      $PrefixMultiplier = new PrefixMultiplier();
       $Content = 'Vyúčtovaní subjektu <strong>'.$Subject['Name'].'</strong> zastoupeného uživatelem <strong>'.$User['Name'].'</strong> ke dni <strong>'.$this->System->HumanDate(time()).'</strong>.<br /><br />'."\n".
-        'Váš aktuální tarif: <strong>'.$this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['Name'].' '.$this->System->AddPrefixMultipliers($this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['SpeedMax'], 'bit/s', 3, 'Binary').'</strong><br />'."\n".
+        'Váš aktuální tarif: <strong>'.$this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['Name'].' '.$PrefixMultiplier->AddPrefixMultipliers($this->System->Modules['Finance']->Tariffs[$Member['InternetTariffCurrentMonth']]['SpeedMax'], 'bit/s', 3, 'Binary').'</strong><br />'."\n".
         'Vaše platební období: <strong>'.$this->System->Modules['Finance']->BillingPeriods[$Member['BillingPeriod']]['Name'].'</strong><br />'."\n".
         'Pravidelná platba za období: <strong>'.$MemberPayment['MonthlyTotal'].' Kč</strong><br />'."\n".

trunk/Modules/Log/Log.php

@@ -36 +36 @@
       );
     }
-    return(GenerateRSS(array(
-      'Title' => $this->System->Config['Web']['Title'].' - Záznamy operací',
-      'Link' => 'http://'.$this->System->Config['Web']['Host'].'/',
-      'Description' => 'Záznamy operací',
-      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
-      'Items' => $Items)));
+    $RSS = new RSS();
+    $RSS->Title = $this->System->Config['Web']['Title'].' - Záznamy operací';
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/'; 
+    $RSS->Description = 'Záznamy operací'; 
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail']; 
+    $RSS->Items = $Items;
+    return($RSS->Generate());      
   }
   

trunk/Modules/News/NewsPage.php

@@ -340 +340 @@
     }
 
-    return(GenerateRSS(array(
-      'Title' => $this->System->Config['Web']['Title'].' - Aktuality',
-      'Link' => 'http://'.$this->System->Config['Web']['Host'].'/',
-      'Description' => 'Aktuality komunitní počítačové sítě ZděchovNET',
-      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
-      'Items' => $Items)));      
+    $RSS = new RSS();
+    $RSS->Title = $this->System->Config['Web']['Title'].' - Aktuality';
+    $RSS->Link = 'http://'.$this->System->Config['Web']['Host'].'/'; 
+    $RSS->Description = 'Aktuality komunitní počítačové sítě ZděchovNET'; 
+    $RSS->WebmasterEmail = $this->System->Config['Web']['AdminEmail']; 
+    $RSS->Items = $Items;
+    return($RSS->Generate());      
   }  
 }