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

Timestamp:

Mar 6, 2023, 1:48:45 AM (14 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/Save.php (modified) (9 diffs)

trunk/Modules/Translation/Save.php

@@ -5 +5 @@
   function Translate($Group, $TextID, $Complete, $Language)
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
     $Table = $Group['TablePrefix'];
@@ -17 +18 @@
       // Get data for english original
       $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') '.
-          'AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
+          'AND (`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
           'AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
       if ($DbResult->num_rows > 0)
@@ -33 +34 @@
           else $Filter = ' AND 0';
 
-          $Query = 'SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter;
+          $Query = 'SELECT * FROM `'.$Table.'` WHERE (`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].')'.$Filter;
           $DbResult = $this->Database->query($Query);
           while ($EnglishFound = $DbResult->fetch_assoc())
           {
             // Get user translation paired to found english item entry
-            $DbResult2 = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$this->System->User->Id.
+            $DbResult2 = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.
               ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
               ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
@@ -110 +111 @@
               $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
               $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
-                  $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$TakeID.', NOW()';
+                  $EnglishFound['VersionEnd'].', '.$Language.', '.$User->Id.', '.$TakeID.', NOW()';
 
               $CompleteParts = 0;
@@ -178 +179 @@
     global $Message, $MessageType;
 
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
@@ -188 +190 @@
     $Group = $TranslationTree[$GroupId];
     $Table = $Group['TablePrefix'];
-    if ($this->System->User->Licence(LICENCE_USER))
+    if ($User->Licence(LICENCE_USER))
     {
       if (array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
@@ -202 +204 @@
         $Output .= $this->ShowRedirection($GroupId, $Table, $TextID);
 
-        UserLevelUpdate($this->System->User->Id);
+        UserLevelUpdate($User->Id);
       } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
     } else
@@ -237 +239 @@
   function ShowRedirection($GroupId, $Table, $TextID)
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     // Address and redirecting
     $Output = '<br />'.T('Translate').': <a href="'.$this->System->Link('/TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0&entry=').'">'.T('Not translated').'</a> ';
@@ -243 +246 @@
     $next = FollowingTran($TextID, $Table, $GroupId);
     $Output .= '<br /><br />';
-    $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
+    $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$User->Id);
     $redirecting = $DbResult->fetch_assoc();