Changeset 893 for trunk/Modules/Translation/Translation.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/Translation.php (modified) (8 diffs)

trunk/Modules/Translation/Translation.php

@@ -11 +11 @@
 class ModuleTranslation extends Module
 {
+  public array $TranslationTree;
+
   function __construct(System $System)
   {
@@ -79 +81 @@
       (
         'Title' => strip_tags($DbRow['Text'].' ('.$DbRow['UserName'].')'),
-        'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/'),
+        'Link' => 'http://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/'),
         'Description' => $DbRow['Text'],
         'Time' => $DbRow['Date'],
@@ -86 +88 @@
     $Output = GenerateRSS(array
     (
-      'Title' => $this->System->Config['Web']['Title'].' - '.T('Last translations'),
-      'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/'),
-      'Description' => $this->System->Config['Web']['Description'],
-      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
+      'Title' => Core::Cast($this->System)->Config['Web']['Title'].' - '.T('Last translations'),
+      'Link' => 'https://'.Core::Cast($this->System)->Config['Web']['Host'].$this->System->Link('/'),
+      'Description' => Core::Cast($this->System)->Config['Web']['Description'],
+      'WebmasterEmail' => Core::Cast($this->System)->Config['Web']['AdminEmail'],
       'Items' => $Items,
     ));
@@ -113 +115 @@
             $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
             $DbRow['TablePrefix'].'` AS `T`'.
-            ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+            ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.Core::Cast($this->System)->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
             $Count.') AS `T`';
       }
@@ -139 +141 @@
   {
     if (isset($this->TranslationTree)) return $this->TranslationTree;
-    else {
+    else 
+    {
       $Result = array();
       $Groups = array();
@@ -164 +167 @@
   function ShowTranslatedMenu()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $TranslationTree = $this->GetTranslationTree();
 
@@ -183 +187 @@
         '&nbsp;<a title="Přeložené texty, můžete zde hlasovat, nebo opravovat překlady" href="'.
         $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=2&amp;user=0&amp;entry=&amp;text=').'">'.T('Translated').'</a><br />';
-      if (isset($this->System->User) and $this->System->User->Licence(LICENCE_USER))
+      if (isset($User) and $User->Licence(LICENCE_USER))
       {
         $Output .= '&nbsp;<a title="'.T('Unfinished translations').'" href="'.$this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=3').'">'.T('Unfinished').'</a><br />'.
           '&nbsp;<a title="Všechny překlady, které jste přeložil" href="'.
           $this->System->Link('/TranslationList.php?group='.$Group['Id'].'&amp;state=1&amp;user='.
-          $this->System->User->Id).'&amp;entry=&amp;text=">'.T('Own').'</a><br />';
+          $User->Id).'&amp;entry=&amp;text=">'.T('Own').'</a><br />';
       }
       $Output .= '&nbsp;<a title="'.T('Compose special filter').'" href="'.
@@ -198 +202 @@
     return $Output;
   }
+
+  static function Cast(Module $Module): ModuleTranslation
+  {
+    if ($Module instanceof ModuleTranslation)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected '.ModuleTranslation::GetClassName().' type but got '.gettype($Module));
+  }
 }