Changeset 859 for trunk/Modules/Import

Timestamp:

Jan 21, 2016, 10:20:04 AM (9 years ago)

Author:

chronos

Message:

• Modified: Function GetTranslationTree moved from global to Translation module where it belongs.

Location:

trunk/Modules/Import

Files:

• Import.php (modified) (6 diffs)
• Manage.php (modified) (2 diffs)
• cmd.php (modified) (1 diff)

trunk/Modules/Import/Import.php

@@ -15 +15 @@
     $this->License = 'GNU/GPL';
     $this->Description = 'Support for import of data.';
-    $this->Dependencies = array();
+    $this->Dependencies = array('Translation');
   }
 
@@ -183 +183 @@
   function ImportLUA()
   {
-    global $TranslationTree, $PatchVersion;
+    global $PatchVersion;
+
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = 'Načítání textů z LUA souboru...';
 
@@ -237 +239 @@
   function UpdateTranslated()
   {
-    global $TranslationTree, $PatchVersion, $Config;
-
+    global $PatchVersion, $Config;
+
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = '<br /><br />Začínám se synchronizací VersionEnd u přeložených textů<br />';
     foreach($TranslationTree as $Group)
@@ -341 +344 @@
   function ImportDBC()
   {
-    global $System, $TranslationTree, $Config;
-
+    global $System, $Config;
+
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = 'Načítání textů z DBC souboru...';
     if(($this->Group['DBCFileName'] != '') and ($this->Group['TablePrefix'] != ''))
@@ -392 +396 @@
   function ImportGroup($GroupId)
   {
-    global $TranslationTree;
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
     $this->Group = $TranslationTree[$GroupId];
@@ -406 +410 @@
   function ImportSQL()
   {
-    global $TranslationTree, $PatchVersion;
-
-    $Output= '';
+    global $PatchVersion;
+
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
+    $Output = '';
     $File = new FileStream();
     $File->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/sql/'.$this->Group['MangosTable'].'.sql');

trunk/Modules/Import/Manage.php

@@ -43 +43 @@
   function ShowMenu()
   {
-    global $TranslationTree, $System;
-
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = '<strong>Import zdrojů:</strong><br/>'.
       '<a href="?action=instructions">Instrukce pro přípravu zdrojových souborů</a><br/>'.
       '<a href="?action=update_translated">Zaktualizovat verze přeložených</a><br/><br/>'.
-      'Verze klienta použitá pro import: <strong>'.$System->Config['Web']['GameVersion'].'</strong><br/>';
-    $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
+      'Verze klienta použitá pro import: <strong>'.$this->System->Config['Web']['GameVersion'].'</strong><br/>';
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Group`');
     $DbRow = $DbResult->fetch_row();
     $PageList = GetPageList($DbRow[0]);
@@ -68 +67 @@
     $Output .= $Order['Output'];
 
-    $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+    $DbResult = $this->System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
     while($Group = $DbResult->fetch_assoc())
     {

trunk/Modules/Import/cmd.php

@@ -9 +9 @@
 $System->Run();
 $Import = new Import($System);
+$TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
 $Output = '';