Changeset 582 for trunk

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.

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (9 diffs)
• Modules/Translation/Form.php (modified) (1 diff)
• Modules/Translation/Save.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

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();

trunk/Modules/Translation/Form.php

@@ -224 +224 @@
                         $this->Database->query('DELETE FROM `'.$Table.'` WHERE `ID` = '.$TextID.' AND `Language` <> '.$this->System->Config['OriginalLanguage']);
                         $Output = ShowMessage('Překlad byl smazán.');
-                        $this->System->ModuleManager->Modules['Log']->WriteLog('Překlad byl smazán! <a href="form.php?group='.$GroupID.'&amp;ID='.$TextID.'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
+                        $this->System->ModuleManager->Modules['Log']->WriteLog('Překlad byl smazán! <a href="'.$this->System->Link('/form.php?group='.$GroupID.'&amp;ID='.$TextID).'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
                 } else $Output = ShowMessage('Nemáte oprávnění', MESSAGE_CRITICAL);
                 return($Output);

trunk/Modules/Translation/Save.php

@@ -100 +100 @@
                                                         $this->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
         
-                                                        $Output .= 'Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
-                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
+                                                        $Output .= 'Změny v překladu <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID']).'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
+                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Změny v překladu <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID']).'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.', LOG_TYPE_TRANSLATION);
                                                 } else
                                                 {
@@ -148 +148 @@
                                                         $LastID = $this->Database->insert_id;
         
-                                                        $Output .= 'Text <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
-                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
+                                                        $Output .= 'Text <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
+                                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="'.$this->System->Link('/form.php?group='.$GroupId.'&amp;ID='.$LastID).'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;text=&amp;entry=&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.', LOG_TYPE_TRANSLATION);
                                                 }
                                         }

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 581; // Subversion revision
+$Revision = 582; // Subversion revision
 $DatabaseRevision = 574; // Database structure revision 
 $ReleaseTime = '2013-09-12';