Changeset 582 for trunk/Modules/Export

Timestamp:

Sep 12, 2013, 11:19:43 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Make absolute path in some recorded logs.
• Fixed: Do not use global variable $User in export.

File:

• trunk/Modules/Export/Export.php (modified) (9 diffs)

trunk/Modules/Export/Export.php

@@ -50 +50 @@
   function BuildQuery($Group, $Columns = '', $Version = '')
   {
-    global $TranslationTree, $Config;
+    global $TranslationTree;
     
     if ($Version <> '') 
@@ -73 +73 @@
     $Query = 'SELECT `T4`.*, '.$OriginalColumns.' FROM ('.$Query.') AS `T4` '.
     ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T3`.`Entry` = `T4`.`Entry`) '.
-    'AND (`T3`.`Language` = '.$Config['OriginalLanguage'].') AND '.
+    'AND (`T3`.`Language` = '.$this->System->Config['OriginalLanguage'].') AND '.
     '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';  
 
@@ -81 +81 @@
   function ExportToMangosSQL()
   {
-    global $TranslationTree, $User, $Config;
+    global $TranslationTree;
   
     $this->LoadFilters();
@@ -93 +93 @@
       "-- Znaková sada: ".$this->Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".
       "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n".
-      "-- Vygeneroval uživatel: ".$User->Name."\n".
+      "-- Vygeneroval uživatel: ".$this->System->User->Name."\n".
       "-- Vzato od uživatelů: ".$this->UserNames."\n".
       "-- Generované tabulky: ";
@@ -149 +149 @@
   function ExportToAoWoWSQL() 
   {
-    global $Config, $TranslationTree, $AoWoWconf;
+    global $TranslationTree, $AoWoWconf;
   
     //require_once('../aowow/configs/config.php');
@@ -175 +175 @@
         $Ori_text = $Line['name'];
         $DbResult2 = $Database2->query('SELECT `Text` AS `En`,
-        (SELECT `Text` FROM `'.$Config['Database']['Database'].'`.`TextGlobalString` AS `TableTran`
+        (SELECT `Text` FROM `'.$this->System->Config['Database']['Database'].'`.`TextGlobalString` AS `TableTran`
          WHERE `TableEn`.`Entry` = `TableTran`.`Entry` AND (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `Tran`
-         FROM `'.$Config['Database']['Database'].'`.`TextGlobalString` AS `TableEn` WHERE
+         FROM `'.$this->System->Config['Database']['Database'].'`.`TextGlobalString` AS `TableEn` WHERE
           `Text` = "'.addslashes($Ori_text).'" LIMIT 1');
         $Tran = $DbResult2->fetch_assoc();
@@ -205 +205 @@
   function ExportToXML()
   {
-    global $TranslationTree, $User;
+    global $TranslationTree;
   
     $this->LoadFilters();
@@ -215 +215 @@
     "    <time>".date('r')."</time>\n".
     "    <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n".
-    "    <author>".$User->Name."</author>\n".
+    "    <author>".$this->System->User->Name."</author>\n".
     "    <contributors>\n";
     foreach(explode(',', $this->UserNames) as $UserName)
@@ -258 +258 @@
   function ExportToDBC()
   {
-    global $TranslationTree, $Config;
+    global $TranslationTree;
   
     $this->LoadFilters();