Changeset 902

Timestamp:

Feb 15, 2025, 9:29:56 AM (7 days ago)

Author:

chronos

Message:

• Fixed: Showing date from null values.
• Fixed_ Forum id validity check.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Forum/Forum.php (modified) (1 diff)
• Modules/Wiki/Wiki.php (modified) (1 diff)
• includes/Global.php (modified) (3 diffs)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 900; // Subversion revision
+$Revision = 902; // Subversion revision
 $DatabaseRevision = 900; // Database structure revision
-$ReleaseDate = strtotime('2024-04-10');
+$ReleaseDate = strtotime('2025-02-15');

trunk/Modules/Forum/Forum.php

@@ -190 +190 @@
     } else $SearchQuery = '';
 
-    $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
-    if ($DbResult->num_rows > 0)
-    {
-    $Thread = $DbResult->fetch_assoc();
-    $Output .= '<h3>'.htmlspecialchars($Thread['Text']).'</h3>';
-
-    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` WHERE `Thread` = '.($_GET['Thread']*1).' '.$SearchQuery);
-    $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);
-
-    $Output .= $PageList['Output'];
-    $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())
-    {
-      if ($User->Id == $Line['User'])
+    $ThreadId = 0;
+    if (TryGetUrlParameterInt('Thread', $ThreadId))
+    {
+      $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.$ThreadId.' LIMIT 1');
+      if ($DbResult->num_rows > 0)
       {
-        $edit = '<a href="?Edit='.$Line['ID'].'">'.T('edit').'</a>';
-      } else $edit = '';
-      $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> ';
-    }
-    $Output .= '</div>'.$PageList['Output'];
-    } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+        $Thread = $DbResult->fetch_assoc();
+        $Output .= '<h3>'.htmlspecialchars($Thread['Text']).'</h3>';
+
+        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` WHERE `Thread` = '.$ThreadId.' '.$SearchQuery);
+        $DbRow = $DbResult->fetch_row();
+        $PageList = GetPageList($DbRow[0]);
+
+        $Output .= $PageList['Output'];
+        $Output .= '<div class="shoutbox">';
+        $DbResult = $this->System->Database->query('SELECT * FROM `ForumText` WHERE `Thread` = '.
+          $ThreadId.' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+        while ($Line = $DbResult->fetch_assoc())
+        {
+          if ($User->Id == $Line['User'])
+          {
+            $Edit = '<a href="?Edit='.$Line['ID'].'">'.T('edit').'</a>';
+          } else $Edit = '';
+          $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> ';
+        }
+        $Output .= '</div>'.$PageList['Output'];
+      } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Id not found'), MESSAGE_CRITICAL);
     return $Output;
   }

trunk/Modules/Wiki/Wiki.php

@@ -25 +25 @@
     {
       $DbRow = $DbResult->fetch_assoc();
-      if (array_key_exists('ver', $_GET))
-      {
-        $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' AND Id='.$_GET['ver']*1);
+      $Ver = 0;
+      if (TryGetUrlParameterInt('ver', $Ver))
+      {  
+        $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' AND Id='.$Ver);
         if ($DbResult2->num_rows > 0)
         {

trunk/includes/Global.php

@@ -311 +311 @@
 $Moderators = array('Překladatel', 'Moderátor', 'Administrátor');
 
-function HumanDate(string $SQLDateTime): string
-{
-  if ($SQLDateTime == '') return ' ';
+function HumanDate(?string $SQLDateTime): string
+{
+  if (($SQLDateTime == NULL) or ($SQLDateTime == '')) return ' ';
   $DateTimeParts = explode(' ', $SQLDateTime);
   if ($DateTimeParts[0] != '0000-00-00')
@@ -322 +322 @@
 }
 
-function HumanDateTime(string $SQLDateTime): string
-{
-  if ($SQLDateTime == '') return ' ';
+function HumanDateTime(?string $SQLDateTime): string
+{
+  if (($SQLDateTime == NULL) or ($SQLDateTime == '')) return ' ';
   $DateTimeParts = explode(' ', $SQLDateTime);
   if ($DateTimeParts[0] != '0000-00-00' and $SQLDateTime <> '')
@@ -430 +430 @@
 function LoadCommandLineParameters(): void
 {
-  if (!array_key_exists('REMOTE_ADDR', $_SERVER))
+  if (!array_key_exists('REMOTE_ADDR', $_SERVER) && is_array($_SERVER['argv']))
   {
     foreach ($_SERVER['argv'] as $Parameter)