Changeset 888 for trunk/Modules/Forum

Timestamp:

Dec 27, 2022, 7:50:23 PM (2 years ago)

Author:

chronos

Message:

• Modified: Updated Common package to latest version.
• Modified: Fixes related to PHP 8.x.

File:

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

trunk/Modules/Forum/Forum.php

@@ -1 +1 @@
 <?php
 
-class ModuleForum extends AppModule
+class ModuleForum extends Module
 {
   function __construct(System $System)
@@ -14 +14 @@
   }
 
-  function DoStart()
-  {
-    $this->System->RegisterPage('forum', 'PageForum');
+  function DoStart(): void
+  {
+    $this->System->RegisterPage(['forum'], 'PageForum');
     $this->System->ModuleManager->Modules['News']->RegisterRSS(array(
       'Title' => T('Forum'), 'Channel' => 'forum', 'Callback' => array('PageForum', 'ShowRSS'),
@@ -29 +29 @@
       $this->System->Link('/forum/?search='));
 
-    $this->System->RegisterMenuItem(array(
+    Core::Cast($this->System)->RegisterMenuItem(array(
       'Title' => T('Forum'),
       'Hint' => T('Forum about translation wow'),
@@ -68 +68 @@
 class PageForum extends Page
 {
-  function Show()
+  function Show(): string
   {
     $Output = '';
@@ -181 +181 @@
     $Output = '';
 
-    $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
+    $Parser = new HTML_BBCodeParser2(array('filters' => array('Basic', 'Extended', 'Images', 'Links', 'Lists', 'Email')));
 
     if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
@@ -205 +205 @@
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT * FROM `ForumText` WHERE `Thread` = '.
-      ($_GET['Thread']*1).' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-    while ($Line = $DbResult->fetch_assoc()) {
+      ($_GET['Thread'] * 1).' '.$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'].'">'.T('edit').'</a>';
-      else $edit = '';
+      } else $edit = '';
+      $Text = str_replace("\n", '<br />', $Parser->qparse(htmlspecialchars($Line['Text'])));
       $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).
-        ')</span><strong>'.$Line['UserName'].'</strong>: '.str_replace("\n", '<br />',
-        $parser->qparse(htmlspecialchars($Line['Text']))).'  </div> ';
+        ')</span><strong>'.$Line['UserName'].'</strong>: '.$Text.'  </div> ';
     }
     $Output .= '</div>'.$PageList['Output'];
@@ -243 +245 @@
     if ($this->System->User->Licence(LICENCE_USER))
     {
-        $Output .= '<form action="?" method="post">'.
-            '<fieldset><legend>'.T('New thread').'</legend>'.
-            T('User').': ';
-        if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+      $Output .= '<form action="?" method="post">'.
+        '<fieldset><legend>'.T('New thread').'</legend>'.T('User').': ';
+      if ($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
         else $Output .= '<input type="text" name="user" /><br />';
       $Output .= T('Name of thread').': <br />'.