Changeset 893 for trunk/Modules/Dictionary

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/Dictionary/Dictionary.php (modified) (16 diffs)

trunk/Modules/Dictionary/Dictionary.php

@@ -28 +28 @@
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('dictionary',
       T('Dictionary'), array('Text', 'Description'),
-     '(SELECT * FROM `Dictionary` WHERE `Language` = '.$this->System->Config['OriginalLanguage'].') AS `T`',
+     '(SELECT * FROM `Dictionary` WHERE `Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') AS `T`',
         $this->System->Link('/dictionary/?search='));
   }
@@ -88 +88 @@
   function DictionaryInsert()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $Output = '';
-    if ($this->System->User->Licence(LICENCE_USER))
+    if ($User->Licence(LICENCE_USER))
     {
       $Output .= '<form action="?action=save" method="post">'.
@@ -108 +109 @@
   function DictionarySave()
   {
-    if ($this->System->User->Licence(LICENCE_USER))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_USER))
     {
       if (array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
@@ -114 +116 @@
         // Check if original text exists and determine entry id
         $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE '.
-          '`Text` = "'.$_POST['Original'].'" AND `Language`= '.$this->System->Config['OriginalLanguage']);
+          '`Text` = "'.$_POST['Original'].'" AND `Language`= '.Core::Cast($this->System)->Config['OriginalLanguage']);
         if ($DbResult->num_rows > 0)
         {
@@ -125 +127 @@
           $Entry = $DbRow[0] + 1;
           $this->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , '.
-            '`User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.$this->System->Config['OriginalLanguage'].');');
+            '`User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.Core::Cast($this->System)->Config['OriginalLanguage'].');');
         }
 
         $DbResult = $this->Database->query('SELECT `Id` FROM `Dictionary` WHERE '.
-          '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$this->System->User->Id);
+          '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$User->Id);
         if ($DbResult->num_rows > 0)
         {
@@ -138 +140 @@
           $this->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , '.
             '`User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.
-            $_POST['Description'].'", '.$this->System->User->Id.', '.$_POST['Language'].')');
+            $_POST['Description'].'", '.$User->Id.', '.$_POST['Language'].')');
         $Output = ShowMessage('Záznam byl uložen!');
       } else $Output = ShowMessage(T('You have to fill all column of form.'), MESSAGE_CRITICAL);
@@ -147 +149 @@
   function DictionaryRemove()
   {
-    if ($this->System->User->Licence(LICENCE_USER))
-    {
-      $this->Database->query('DELETE FROM `Dictionary` WHERE (`User`='.$this->System->User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_USER))
+    {
+      $this->Database->query('DELETE FROM `Dictionary` WHERE (`User`='.$User->Id.') AND (`Id`='.($_GET['id'] * 1).')');
       $Output = ShowMessage(T('Record removed'));
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
@@ -157 +160 @@
   function DictionaryModify()
   {
-    if ($this->System->User->Licence(LICENCE_USER))
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
+    if ($User->Licence(LICENCE_USER))
     {
       $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE `Id`='.($_GET['id'] * 1));
@@ -164 +168 @@
         $DbRow = $DbResult->fetch_assoc();
         $DbResult = $this->Database->query('SELECT * FROM `Dictionary` WHERE (`User` IS NULL) '.
-          'AND (`Entry`='.$DbRow['Entry'].') AND (`Language`= '.$this->System->Config['OriginalLanguage'].')');
+          'AND (`Entry`='.$DbRow['Entry'].') AND (`Language`= '.Core::Cast($this->System)->Config['OriginalLanguage'].')');
         $DbRow2 = $DbResult->fetch_assoc();
         $Output = '<form action="?action=save" method="post">'.
@@ -216 +220 @@
   function DictionaryShow()
   {
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     global $LanguageList;
 
@@ -227 +232 @@
       <input type="text" value="'.$Search.'" name="search" size="30" />
       <input type="submit" value="'.T('Search').'" />';
-    if ($this->System->User->Licence(LICENCE_USER))
+    if ($User->Licence(LICENCE_USER))
       $Output .= ' <a href="?action=insert">'.T('Add word').'</a>';
 
@@ -258 +263 @@
       '`T1`.`Entry`, `T2`.`Text` AS `Original`, `T1`.`Text` AS `Translated`, `T1`.`Description` '.
       'FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` '.
-      'ON (`T2`.`Entry` = `T1`.`Entry`) AND (`T2`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+      'ON (`T2`.`Entry` = `T1`.`Entry`) AND (`T2`.`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') '.
       'JOIN `Language` ON `Language`.`Id` = `T1`.`Language` '.
       'JOIN `User` ON `User`.`ID` = `T1`.`User` '.
@@ -279 +284 @@
     $TableColumns[] = array('Name' => 'Description', 'Title' => T('Description'));
     $TableColumns[] = array('Name' => 'UserName', 'Title' => T('Translator'));
-    if ($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('Action'));
+    if ($User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('Action'));
     $Order = GetOrderTableHeader($TableColumns, 'Original');
     $Output .= '<table class="BaseTable">'.$Order['Output'];
@@ -294 +299 @@
         '<td><a href="'.$this->System->Link('/user/?user='.$Line['UserId']).'">'.
         $Line['UserName'].'</a></td>';
-      if ($this->System->User->Licence(LICENCE_USER))
-      {
-        if ($Line['UserId'] == $this->System->User->Id)
+      if ($User->Licence(LICENCE_USER))
+      {
+        if ($Line['UserId'] == $User->Id)
           $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].
             '" onclick="return confirmAction(\''.T('Do you really want to delete item?').'\');">'.T('Delete').'</a>'.
@@ -315 +320 @@
     global $LanguageList;
 
+    $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
     $this->Title = T('Dictionary');
 
@@ -321 +327 @@
     if (!isset($_SESSION['language']))
     {
-      if ($this->System->User->Licence(LICENCE_USER))
-      {
-        $_SESSION['language'] = $this->System->User->Language;
+      if ($User->Licence(LICENCE_USER))
+      {
+        $_SESSION['language'] = $User->Language;
       } else $_SESSION['language'] = '';
     }