Changeset 893 for trunk/Modules/Translation/Progress.php

Timestamp:

Mar 6, 2023, 1:48:45 AM (22 months ago)

Author:

chronos

Message:

• Fixed: Class types casting for better type checking.
• Fixed: XML direct export.
• Modified: User class instance moved from Core class to ModuleUser class.

File:

• trunk/Modules/Translation/Progress.php (modified) (8 diffs)

trunk/Modules/Translation/Progress.php

@@ -9 +9 @@
     $BuildNumber = GetBuildNumber($_SESSION['StatVersion']);
     if (is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
-    else $LanguageFilter = ' AND (`Language`!='.$this->System->Config['OriginalLanguage'].')';
+    else $LanguageFilter = ' AND (`Language`!='.Core::Cast($this->System)->Config['OriginalLanguage'].')';
 
     $GroupListQuery = 'SELECT `Id`, `TablePrefix`, `Name` FROM `Group`';
@@ -25 +25 @@
           '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
           'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-          'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+          'WHERE (`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') '.
           'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
           ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
@@ -59 +59 @@
       else $TotalCount = 0;
       $Output .= '<tr><td><strong>'.T('Total').'</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $TotalCount).'</strong></td></tr>'.
-          '</table>';
+        '</table>';
     }
     return $Output;
@@ -66 +66 @@
   function Show(): string
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $this->Title = T('Progress');
     $LanguageList = GetLanguageList();
@@ -72 +73 @@
     if (!array_key_exists('StatVersion', $_SESSION))
     {
-      if ($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
+      if ($User->Licence(LICENCE_USER) and ($User->PreferredVersionGame != ''))
       {
-        $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
-      } else {
-        $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
+        $_SESSION['StatVersion'] = $User->PreferredVersionGame;
+      } else 
+      {
+        $_SESSION['StatVersion'] = Core::Cast($this->System)->Config['Web']['GameVersion'];
       }
     }
@@ -82 +84 @@
     if (!isset($_SESSION['language']))
     {
-      if ($this->System->User->Licence(LICENCE_USER))
+      if ($User->Licence(LICENCE_USER))
       {
-        $_SESSION['language'] = $this->System->User->Language;
-      } else {
+        $_SESSION['language'] = $User->Language;
+      } else 
+      {
         $_SESSION['language'] = '';
       }
@@ -93 +96 @@
       if ($_GET['language'] == '') {
         $_SESSION['language'] = '';
-      } else {
+      } else 
+      {
         $_SESSION['language'] = $_GET['language'] * 1;
       }
@@ -103 +107 @@
     $DbResult = $this->Database->query('SELECT `Version`, `Title` FROM `ClientVersion` WHERE `Imported`=1 ORDER BY `Version`');
     while ($DbRow = $DbResult->fetch_assoc())
+    {
       $Output .= '<a href="?Version='.$DbRow['Version'].'" title="'.$DbRow['Title'].'">'.$DbRow['Version'].'</a> ';
+    }
     $Output .= '<br/>';