Changeset 891 for trunk/Modules/Forum

Timestamp:

Jan 13, 2023, 12:40:34 AM (2 years ago)

Author:

chronos

Message:

• Fixed: HTML BBCode parser not supported for newer PHP 8.1. Replaced by simpler solution.

File:

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

trunk/Modules/Forum/Forum.php

@@ -40 +40 @@
   function ShowBox()
   {
-    $Parser = new HTML_BBCodeParser2(array('filters' => array('Basic', 'Extended',
-      'Images', 'Links', 'Lists', 'Email')));
     $Count = 20;
     $Output = '<strong><a href="'.$this->System->Link('/forum/').'">'.T('Last forum posts').':</a></strong>';
@@ -58 +56 @@
         '<td><a href="'.$this->System->Link('/forum/?Thread='.$DbRow['Thread']).'">'.HumanDate($DbRow['Date']).'</a></td>'.
         '<td><a href="'.$this->System->Link('/user/?user='.$DbRow['UserId']).'">'.$DbRow['UserName'].'</a></td>'.
-        '<td>'.$Parser->qparse(htmlspecialchars($DbRow['Text'])).'</td>'.
+        '<td>'.ShowBBcodes(htmlspecialchars($DbRow['Text'])).'</td>'.
         '</tr>';
     }
@@ -74 +72 @@
     if (array_key_exists('a', $_POST)) $Action = $_POST['a'];
       else if (array_key_exists('a', $_GET)) $Action = $_GET['a'];
-       else $Action = '';
+      else $Action = '';
     if (array_key_exists('Edit', $_GET)) {
       if (array_key_exists('text', $_POST))
         $Output .= $this->Edit();
       $Output .= $this->ShowEditForm();
-
     } else
     if (array_key_exists('search', $_GET))
@@ -101 +98 @@
   {
     $Output = '';
-    $Text = $_POST['text'];
-    $DbResult = $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
+    $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
     $Output .= ShowMessage(T('Text edited.'));
     return $Output;
@@ -132 +128 @@
   function ShowSearchForum()
   {
-    $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-    $Count = 20;
     $Output = '';
 
@@ -153 +147 @@
       $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.
       htmlspecialchars($Line['ThreadName']).'</a><br /><strong>'.$Line['UserName'].
-      '</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse(htmlspecialchars($Line['Text'])).'</div> ';
+      '</strong> ('.HumanDate($Line['Date']).'): '.ShowBBcodes(htmlspecialchars($Line['Text'])).'</div> ';
     $Output .= '</div>'.$PageList['Output'];
     return $Output;
@@ -181 +175 @@
     $Output = '';
 
-    $Parser = new HTML_BBCodeParser2(array('filters' => array('Basic', 'Extended', 'Images', 'Links', 'Lists', 'Email')));
-
     if (array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
     else if (!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
@@ -212 +204 @@
         $edit = '<a href="?Edit='.$Line['ID'].'">'.T('edit').'</a>';
       } else $edit = '';
-      $Text = str_replace("\n", '<br />', $Parser->qparse(htmlspecialchars($Line['Text'])));
+      $Text = str_replace("\n", '<br />', ShowBBcodes(htmlspecialchars($Line['Text'])));
       $Output .= '<div><span style="float:right;">'.$edit.' ('.HumanDate($Line['Date']).
         ')</span><strong>'.$Line['UserName'].'</strong>: '.$Text.'  </div> ';
@@ -306 +298 @@
   function ShowRSS()
   {
-    $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-
     $Items = array();
     $TitleLength = 50;
@@ -322 +312 @@
         'Title' => htmlspecialchars($DbRow['ThreadText']).' - '.$DbRow['UserName'].': ',
         'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/?Thread='.$DbRow['Thread']),
-        'Description' => $parser->qparse(htmlspecialchars($DbRow['Text'])),
+        'Description' => ShowBBcodes(htmlspecialchars($DbRow['Text'])),
         'Time' => $DbRow['UnixDate'],
       );