Changeset 901 for trunk/Modules

Timestamp:

Oct 2, 2024, 10:31:47 PM (7 weeks ago)

Author:

chronos

Message:

• Fixed: More integer URL parameters checking.
• Modified: More explicit function types.

Location:

trunk/Modules

Files:

• ClientVersion/ClientVersion.php (modified) (1 diff)
• News/News.php (modified) (3 diffs)
• Translation/Form.php (modified) (1 diff)

trunk/Modules/ClientVersion/ClientVersion.php

@@ -39 +39 @@
   }
 
-  function ShowItem()
+  function ShowItem(): string
   {
-    if (array_key_exists('id', $_GET))
+    $Id = 0;
+    if (TryGetUrlParameterInt('id', $Id))
     {
       $YesNo = array('Ne', 'Ano');
-      $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.($_GET['id']*1));
+      $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$Id);
       if ($DbResult->num_rows > 0)
       {
         $Version = $DbResult->fetch_assoc();
 
-      $Output = '<h3>'.T('Client version').'</h3>';
-      $Output .= '<table class="BaseTable">'.
-        '<tr><td>'.T('Version').'</td><td>'.$Version['Version'].'</td></tr>'.
-        '<tr><td>'.T('More information').'</td><td><a href="http://www.wowwiki.com/Patch_'.$Version['Version'].'">wowwiki.com'.
-        '</a></td></tr>'.
-        '<tr><td>'.T('Build number').'</td><td>'.$Version['BuildNumber'].'</td></tr>'.
-        '<tr><td>'.T('Release date').'</td><td>'.HumanDate($Version['ReleaseDate']).'</td></tr>'.
-        '<tr><td>'.T('Title').'</td><td>'.$Version['Title'].'</td></tr>'.
-        '<tr><td>'.T('Imported').'</td><td>'.$YesNo[$Version['Imported']].'</td></tr>'.
-        '</table>';
+        $Output = '<h3>'.T('Client version').'</h3>';
+        $Output .= '<table class="BaseTable">'.
+          '<tr><td>'.T('Version').'</td><td>'.$Version['Version'].'</td></tr>'.
+          '<tr><td>'.T('More information').'</td><td><a href="http://www.wowwiki.com/Patch_'.$Version['Version'].'">wowwiki.com'.
+          '</a></td></tr>'.
+          '<tr><td>'.T('Build number').'</td><td>'.$Version['BuildNumber'].'</td></tr>'.
+          '<tr><td>'.T('Release date').'</td><td>'.HumanDate($Version['ReleaseDate']).'</td></tr>'.
+          '<tr><td>'.T('Title').'</td><td>'.$Version['Title'].'</td></tr>'.
+          '<tr><td>'.T('Imported').'</td><td>'.$YesNo[$Version['Imported']].'</td></tr>'.
+          '</table>';
         $Output .= '<div><a href="?">'.T('All versions list').'</a></div>';
         if ($Version['Imported'])
+        {
           $Output .= '<div><a href="'.$this->System->Link('/progress/?Version='.
             $Version['Version']).'">'.T('Progress').'</a></div>';
+        }
       } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Id not valid'), MESSAGE_CRITICAL);
     return $Output;
   }
 
-  function ShowList()
+  function ShowList(): string
   {
     $this->Title = T('Game version');

trunk/Modules/News/News.php

@@ -97 +97 @@
     $Output .= '<div class="shoutbox">';
     $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
-        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
+      '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
     while ($Line = $DbResult->fetch_assoc())
     {
@@ -108 +108 @@
   function ShowItem()
   {
-    if (array_key_exists('i', $_GET))
+    $Id = 0;
+    if (TryGetUrlParameterInt('i', $Id))
     {
       $Output = '<h3>'.T('News').'</h3>';
       $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, `News`.`Id`, '.
-        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id` = '.($_GET['i'] * 1));
+        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` WHERE `News`.`Id` = '.$Id);
       if ($DbResult->num_rows == 1)
       {
@@ -118 +119 @@
         $Output .= '<h4>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</h4><div>'.$Line['Text'].' ('.$Line['User'].')</div>';
       } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Id not valid'), MESSAGE_CRITICAL);
     $Output .= '<br/><a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
     return $Output;

trunk/Modules/Translation/Form.php

@@ -30 +30 @@
       else $Action = '';
 
-    if (array_key_exists('ID', $_GET))
+    $TextID = 0;
+    if (TryGetUrlParameterInt('ID', $TextID))
     {
-      $TextID = $_GET['ID'] * 1;
       $this->ID = $TextID;