Changeset 893 for trunk/includes

Timestamp:

Mar 6, 2023, 1:48:45 AM (21 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.

Location:

trunk/includes

Files:

• Global.php (modified) (4 diffs)
• PageEdit.php (modified) (3 diffs)

trunk/includes/Global.php

@@ -118 +118 @@
 }
 
-function GetTranslateGoogle($text, $withouttitle = false)
-{
-  global $System;
-
+function GetTranslateGoogle($System, $text, $withouttitle = false)
+{
 //  $text = 'Balthule\'s letter is dire. This Cult of the Dark Strand is a thorn in my side that must be removed. I have been dealing with some of the Dark Strand scum northeast of here at Ordil\'Aran. One of their number possesses a soul gem that I believe holds the secret to the cult\'s power.$b$bBring it to me, and I will be able to decipher the secrets held within.';
  // $text = htmlspecialchars($text);
@@ -130 +128 @@
 //  $text = str_replace('&','',$text);
 //  $text = str_replace(' ','%20',$text);
-  $DbResult = $System->Database->select('Language', '`Code`', '`Id`='.$System->User->Language);
+  $User = ModuleUser::Cast($System->GetModule('User'))->User;
+  $DbResult = $System->Database->select('Language', '`Code`', '`Id`='.$User->Language);
   $DbRow = $DbResult->fetch_assoc();
   $lang = $DbRow['Code'];
@@ -413 +412 @@
 {
   global $System;
-  $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
+  $TranslationTree = ModuleTranslation::Cast($System->ModuleManager->GetModule('Translation'))->GetTranslationTree();
 
   if (array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1;
@@ -512 +511 @@
   global $System;
 
-  $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
+  $TranslationTree = ModuleTranslation::Cast($System->ModuleManager->GetModule('Translation'))->GetTranslationTree();
 
   foreach ($TranslationTree as $TableID => $Value)

trunk/includes/PageEdit.php

@@ -3 +3 @@
 class PageEdit extends Page
 {
-  var $Table;
-  var $Definition;
-  var $ItemActions;
+  public string $Table;
+  public string $TableSQL;
+  public array $Definition;
+  public array $ItemActions;
+  public bool $AllowEdit;
 
   function __construct($System)
@@ -109 +111 @@
   {
     $Output = '';
-    if ($this->System->User->Licence(LICENCE_USER))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_USER))
     {
       if (array_key_exists('finish', $_GET))
@@ -140 +143 @@
   function DeleteItem()
   {
-    if ($this->System->User->Licence(LICENCE_USER))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_USER))
     {
-      $this->Database->query('DELETE FROM `'.$this->Table.'` WHERE (`User`='.$this->System->User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
+      $this->Database->query('DELETE FROM `'.$this->Table.'` WHERE (`User`='.$User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
       $Output = ShowMessage(T('Record removed'));
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);