Changeset 12 for Common

Timestamp:

Apr 7, 2020, 9:14:24 PM (5 years ago)

Author:

chronos

Message:

• Modified: Small updates.

Location:

Common

Files:

• Common.php (modified) (1 diff)
• Database.php (modified) (2 diffs)
• RSS.php (modified) (3 diffs)
• Table.php (modified) (1 diff)

Common/Common.php

@@ -49 +49 @@
   var $Page;
 
-  function __construct()
+  function __construct($System)
   {
-    global $System;
-
     $this->ItemPerPage = $System->Config['Web']['ItemsPerPage'];
     $this->Around = $System->Config['Web']['VisiblePagingItems'];

Common/Database.php

@@ -2 +2 @@
 
 // Extended database class
-// Date: 2016-01-11
+// Date: 2020-04-07
 
 function microtime_float()
@@ -93 +93 @@
     if (!$this->Connected()) throw new Exception(T('Not connected to database'));
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true)) $QueryStartTime = microtime_float();
-    $this->LastQuery = $Query;
-    //echo('a'.$this->ShowSQLQuery.'<'.$QueryStartTime.', '.microtime_float());
+    $this->LastQuery = $Query;    
     if (($this->ShowSQLQuery == true) or ($this->LogSQLQuery == true))
       $Duration = ' ; '.round(microtime_float() - $QueryStartTime, 4). ' s';

Common/RSS.php

@@ -12 +12 @@
   function __construct()
   {
-    $this->Charset = 'utf8';
+    $this->Charset = 'utf-8';
     $this->Items = array();
   }
@@ -18 +18 @@
   function Generate()
   {
+    Header('Content-Type: text/xml; charset=utf-8');
     $Result = '<?xml version="1.0" encoding="'.$this->Charset.'" ?>'."\n". //<?
-  '<rss version="2.0">'."\n".
-  "  <channel>\n".
-  "    <title>".$this->Title."</title>\n".
-  "    <link>".$this->Link."</link>\n".
-  "    <description>".$this->Description."</description>\n".
-  "    <language>cs</language>\n".
-  "    <webMaster>".$this->WebmasterEmail."</webMaster>\n".
-  "    <pubDate>".date('r')."</pubDate>\n".
-  "    <ttl>20</ttl>\n";
+      '<rss version="2.0">'."\n".
+      "  <channel>\n".
+      "    <title>".$this->Title."</title>\n".
+      "    <link>".$this->Link."</link>\n".
+      "    <description>".$this->Description."</description>\n".
+      "    <language>cs</language>\n".
+      "    <webMaster>".$this->WebmasterEmail."</webMaster>\n".
+      "    <pubDate>".date('r')."</pubDate>\n".
+      "    <ttl>20</ttl>\n";
     foreach ($this->Items as $Item)
     {
@@ -33 +34 @@
         '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
         '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
-  '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
-  '      <link>'.$Item['Link']."</link>\n".
+        '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
+        '      <link>'.$Item['Link']."</link>\n".
         "    </item>\n";
     }

Common/Table.php

@@ -98 +98 @@
   var $Style;
 
-  function __construct()
+  function __construct($System)
   {
-    global $System;
-
     $this->Columns = array();
     $this->Table = new TableMemory();