Changeset 765 for trunk/Modules/Forum/Forum.php

Timestamp:

Jan 27, 2014, 10:01:33 PM (11 years ago)

Author:

chronos

Message:

• Added: Config parameter Description which is used for general web description included in meta section of HTML page and usable by modules.
• Fixed: Error in RSS channels if no items loaded.
• Modified: Log real last URI instead on script name in online users list in database.
• Fixed: Serialization error in Database class if exception was raised.
• Modified: Items in RSS channel of forum links to exact forum topics.

File:

• trunk/Modules/Forum/Forum.php (modified) (4 diffs)

trunk/Modules/Forum/Forum.php

@@ -130 +130 @@
                 $Output .= '</div>'.$PageList['Output'];
                 return($Output);
-
-        return($Output);
   }
 
@@ -177 +175 @@
                 $Output .= $PageList['Output'];
                 $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `Thread` = '.$_GET['Thread'].' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+                $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `Thread` = '.
+                  $_GET['Thread'].' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
                 while($Line = $DbResult->fetch_assoc()) {
                         if ($this->System->User->Id == $Line['User'])
         $edit = '<a href="?Edit='.$Line['ID'].'">editovat</a>';
       else $edit = '';
-      $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).')</span><strong>'.$Line['UserName'].'</strong>: '.str_replace("\n", '<br />',$parser->qparse($Line['Text'])).'  </div> ';
+      $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).
+        ')</span><strong>'.$Line['UserName'].'</strong>: '.str_replace("\n", '<br />',$parser->qparse($Line['Text'])).'  </div> ';
     }
                 $Output .= '</div>'.$PageList['Output'];
@@ -269 +269 @@
         function ShowRSS()
         {
+    $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
+
+    $Items = array();
           $TitleLength = 50;
           mb_internal_encoding('utf-8');
-          $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `UserName`, `Text`, ( SELECT `Text`  FROM `ForumThread` WHERE  `ID` = `ForumText`.`Thread`) as `Thread`  FROM `ForumText`  ORDER BY `ID` DESC LIMIT 20');
+          $DbResult = $this->Database->query('SELECT `ID`, UNIX_TIMESTAMP(`Date`) AS `UnixDate`, '.
+      '`User`, `UserName`, `Text`, ( SELECT `Text` FROM `ForumThread` '.
+      'WHERE `ID` = `ForumText`.`Thread`) AS `Thread` FROM `ForumText` ORDER BY `ID` DESC LIMIT 20');
           while($DbRow = $DbResult->fetch_assoc())
           {
@@ -278 +283 @@
             $Items[] = array
             (
-                'Title' =>  $DbRow['Thread'].' - '.$DbRow['UserName'].': ',
-                'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/'),
-                'Description' => $DbRow['Text'],
-                'Time' => $DbRow['UnixDate'],
+              'Title' =>  $DbRow['Thread'].' - '.$DbRow['UserName'].': ',
+              'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/?Thread='.$DbRow['ID']),
+              'Description' => $parser->qparse($DbRow['Text']),
+              'Time' => $DbRow['UnixDate'],
             );
           }
           $Output = GenerateRSS(array
-              (
-                  'Title' => 'WoW překlad - Fórum',
-                  'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/'),
-                  'Description' => 'Překlad textů WoW',
-                  'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
-                  'Items' => $Items,
-              ));
-           return($Output);
+          (
+            'Title' => $this->System->Config['Web']['Title'].' - '.T('Forum'),
+            'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/'),
+            'Description' => $this->System->Config['Web']['Description'],
+      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
+      'Items' => $Items,
+    ));
+    return($Output);
         }
 }