Changeset 894 for trunk

Timestamp:

Mar 6, 2023, 12:16:38 PM (22 months ago)

Author:

chronos

Message:

• Fixed: Export error due to PHP 8.1 deprecated code.
• Modified: Code cleanup.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Application/View.php (modified) (2 diffs)
• Install/deb/debian/control (modified) (1 diff)
• Modules/Admin/Admin.php (modified) (2 diffs)
• Modules/Export/CreateAddon.php (modified) (13 diffs)
• Modules/Export/Export.php (modified) (14 diffs)
• Modules/Export/ExportOutput.php (modified) (1 diff)
• Modules/Export/Page.php (modified) (29 diffs)
• Modules/Export/ProcessTask.php (modified) (2 diffs)
• Modules/Export/files/1.12.1/install.nsi (modified) (6 diffs)
• Modules/Export/files/2.4.3/install.nsi (modified) (6 diffs)
• Modules/Export/files/3.3.5a/install.nsi (modified) (6 diffs)
• Modules/Export/files/4.3.4/install.nsi (modified) (6 diffs)
• Modules/Export/files/5.4.0/install.nsi (modified) (4 diffs)
• Modules/Import/Import.php (modified) (23 diffs)
• Modules/Import/generatecodeXML.php (modified) (1 diff)
• includes/Global.php (modified) (1 diff)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 893; // Subversion revision
+$Revision = 894; // Subversion revision
 $DatabaseRevision = 891; // Database structure revision
 $ReleaseDate = strtotime('2023-03-06');

trunk/Application/View.php

@@ -3 +3 @@
 class BaseView extends View
 {
-  public string $Title;
+  public string $Title = '';
 
   function ShowLocaleSelector()
   {
-    //$Output .= ' <form action="?setlocale" method="get">';
     $Output = ' <select onchange="window.location=this.value">';
     foreach (Core::Cast($this->System)->LocaleManager->Available as $Locale)
@@ -45 +44 @@
 
     $Output .= $this->ShowLocaleSelector();
-    //$Output .= '</form>';
     $Output .= '</span></div>';
     return $Output;

trunk/Install/deb/debian/control

@@ -8 +8 @@
 Package: wowpreklad
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, apache2, php, dbconfig-mysql
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2, php, dbconfig-mysql, nsis
 Description: World of Warcraft web translation platform.
 HomePage: https://app.zdechov.net/wowpreklad

trunk/Modules/Admin/Admin.php

@@ -233 +233 @@
         //      $Output .= '<input type="submit" value="uložit"></form>';
 
-
+        $FileName = NormalizePath(dirname(__FILE__).'/../source/'.$_SESSION['GameVersion'].'/dbc/'.$Group['DBCFileName'].'.dbc.csv');
         $File = new FileStream();
-
-        $File->OpenFile(dirname(__FILE__).'/../source/'.$_SESSION['GameVersion'].'/dbc/'.
-          $Group['DBCFileName'].'.dbc.csv');
+        $File->OpenFile($FileName);
 
         //while (!$File->EOF())
@@ -254 +252 @@
         {
           foreach ($Group['Items'] as $GroupItem)
+          {
             $Output .=   ' <a href="'.$this->System->Link('/admin/?action=dbcstructure&amp;id='.
               $Group['Id'].'&amp;GroupItem='.$GroupItem['Id'].'&amp;ColumnIndex='.$i).'">'.
               $GroupItem['Column'].'</a><br/>';
-            $Output .= '</td><td>';
+          }
+          $Output .= '</td><td>';
         }
 

trunk/Modules/Export/CreateAddon.php

@@ -6 +6 @@
 {
   // Replace special codes by lua functions
-  function ReplaceVarInText($string, $strlower = 'strlower')
+  function ReplaceVarInText(string $string, string $strlower = 'strlower'): string
   {
     $string = str_replace('$N', '"..'.$strlower.'(UnitName("player")).."', $string);
@@ -47 +47 @@
   }
 
-  function ReplaceEnText($string)
-  {
-    //  $string = mysql_escape_string($string);
+  function ReplaceEnText(string $string): string
+  {
     $string = strtolower($string);
-
     $string = str_replace('"', '\"', $string);
     $string = str_replace('$b$b', ' ', $string);
@@ -62 +60 @@
     $string = str_replace('\\n', ' ', $string);
     $string = str_replace(' ', '', $string);
-//    while (strpos($string, '  '))
-//      $string = str_replace('  ', ' ', $string);
     return $string;
   }
 
-  function ReplaceCzText($string)
+  function ReplaceCzText(string $string): string
   {
     $string = $this->Database->real_escape_string($string);
@@ -76 +72 @@
   }
 
-  function NotCancel($string)
-  {
-    //echo (strpos($string,'<html>'));
+  function NotCancel(string $string): bool
+  {
     if (strpos($string,'<html>') > -1) return false;
       else return true;
   }
 
-  function my_trim($string)
+  function my_trim(string $string): string
   {
     $string = addslashes($string);
@@ -99 +94 @@
   }
 
-  function MakeLanguageFiles()
-  {
-    global $CreatedFileList;
-
+  function MakeLanguageFiles(): string
+  {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
@@ -116 +109 @@
     while ($Group = $DbResult->fetch_assoc())
     {
-    //získání čísla verze pro export
+      // získání čísla verze pro export
       $ID = $this->Database->query('SELECT LastVersion FROM `Group` WHERE Id = '.$Group['Id']);
       $LastVersion = $ID->fetch_assoc();
@@ -141 +134 @@
         $TableTexts = array();
 
-        //old version
-        //get version before
+        // old version
+        // get version before
         $BuildNumber = $ExportVersion;
         if ($ExportVersion == '') $BuildNumber = $this->ClientVersion['BuildNumber'];
@@ -152 +145 @@
           $ExportVersionOld = $ExportVersionOld['BuildNumber'];
 
-          $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersionOld));
+          $DbResult2 = $this->Database->query($this->BuildQuery($Group, $ExportVersionOld));
           while ($Line = $DbResult2->fetch_assoc())
           {
-            $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
-            $cz = $this->ReplaceCzText($Line[$Column['Column']]);
+            $Text = $Line['En'.$Column['Column']];
+            if ($Text == null) $Text = '';
+            $en = trim($this->ReplaceEnText($Text));
+            $Text = $Line[$Column['Column']];
+            if ($Text == null) $Text = '';
+            $cz = $this->ReplaceCzText($Text);
             if (($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
             {
@@ -165 +162 @@
         //last version
 
-        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));
+        $DbResult2 = $this->Database->query($this->BuildQuery($Group, $ExportVersion));
         while ($Line = $DbResult2->fetch_assoc())
         {
-          $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
-          $cz = $this->ReplaceCzText($Line[$Column['Column']]);
+          $Text = $Line['En'.$Column['Column']];
+          if ($Text == null) $Text = '';
+          $en = trim($this->ReplaceEnText($Text));
+          $Text = $Line[$Column['Column']];
+          if ($Text == null) $Text = '';
+          $cz = $this->ReplaceCzText($Text);
           if (($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
           {
@@ -221 +222 @@
   }
 
-  function MakeClientStrings()
+  function MakeClientStrings(): void
   {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
@@ -232 +233 @@
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`TablePrefix` != "" AND `Group`.`Id` = 14');
-    //$Group = $DbResult->fetch_assoc();
     if ($DbResult->num_rows == 0)
       $CanGenerated = '-1';
@@ -255 +255 @@
   }
 
-  function MakeAddon()
+  function MakeAddon(): string
   {
     if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
@@ -264 +264 @@
   }
 
-  function MakeReadme()
+  function MakeReadme(): void
   {
     $DbResult = $this->Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');

trunk/Modules/Export/Export.php

@@ -9 +9 @@
   public int $Id;
   public array $AnoNe = array('Ne', 'Ano');
-  var $WhereLang;
-  var $WhereUsers;
-  var $SelectedUsers;
-  var $UserNames;
-  var $ClientVersion;
-  var $OrderByUserList;
+  public string $WhereLang;
+  public string $WhereUsers;
+  public string $UserNames;
+  public array $ClientVersion;
+  public string $OrderByUserList;
   public string $TempDir;
   public string $TempDirRelative;
@@ -23 +22 @@
   function Init()
   {
-    $this->TempDir = dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    $this->TempDir = NormalizePath(dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/');
     if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $this->TempDirRelative = Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    $this->SourceDir = dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['SourceFolder'];
+    $this->SourceDir = NormalizePath(dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['SourceFolder']);
     $this->SourceDirRelative = Core::Cast($this->System)->Config['Web']['SourceFolder'];
     if (!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
@@ -131 +130 @@
   }
 
-  function NeedGeneration()
+  function NeedGeneration(): bool
   {
     $this->LoadFilters();
-    $file = '';
-    if ($this->Export['OutputType'] == 10) $file = $this->TempDir.'Instalace_CzechWoW_'.$this->ClientVersion['Version'].'.exe';
-    if ($this->Export['OutputType'] == 9) $file = $this->TempDir.'CzWoW_DBC.zip';
-
-    if (file_exists($file))
-      $date = date('Y-m-d H:i',(filemtime($file)));
+    $FileName = '';
+    if ($this->Export['OutputType'] == 10) $FileName = $this->TempDir.'Instalace_CzechWoW_'.$this->ClientVersion['Version'].'.exe';
+    if ($this->Export['OutputType'] == 9) $FileName = $this->TempDir.'CzWoW_DBC.zip';
+
+    if (file_exists($FileName))
+    {
+      $Date = date('Y-m-d H:i',(filemtime($FileName)));
+    }
     else return true;
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    $result = false;
+    $Result = false;
     while ($Group = $DbResult->fetch_assoc())
     {
@@ -151 +152 @@
       ' JOIN `User` ON `User`.`ID`=`T`.`User`'.
       ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$this->Id.')'.
-      ' WHERE ( \''.$date.'\' < `T`.`ModifyTime`) AND (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.
+      ' WHERE ( \''.$Date.'\' < `T`.`ModifyTime`) AND (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.
       ' ';
 
@@ -157 +158 @@
       if ($DbResult2->num_rows > 0)
       {
-        $result = true;
-      }
-    }
-    return $result;
+        $Result = true;
+      }
+    }
+    return $Result;
   }
 
@@ -206 +207 @@
           {
             if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
-            $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Line[$GroupItem['Column']]).'"';
+            $Text = $Line[$GroupItem['Column']];
+            if ($Text == null) $Text = '';
+            $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Text).'"';
           }
           $Values = substr($Values, 2);
@@ -328 +331 @@
   }
 
-  function ExportToDBC()
+  function ExportToDBC(): string
   {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
-
     $this->LoadFilters();
-
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` '.
@@ -342 +343 @@
       $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
-      if (file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
+
+      $SourceDbcFileName = $this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc';
+      if (file_exists($SourceDbcFileName))
       {
         // Load string column index list
@@ -364 +367 @@
           foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
           {
-            $DbRow[$Column['Column']] = str_replace ('$ ', '$', $DbRow[$Column['Column']]);
-            if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']]))
+            if ($DbRow[$Column['Column']] != null) 
+            { 
+              $DbRow[$Column['Column']] = str_replace('$ ', '$', $DbRow[$Column['Column']]);
+            }
+            $EnText = $DbRow['En'.$Column['Column']];
+            if ($EnText == null) $EnText = '';
+            $TargetText = $DbRow[$Column['Column']];
+            if ($TargetText == null) $TargetText = '';
+            if (!$this->HaveVariable($EnText, $TargetText))
             {
               $CanExport = false;
               $Output .= ', NE='.$DbRow['ID'];
             }
-            if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']]))
+            if (!$this->HaveVariable($TargetText, $EnText))
             {
               $CanExport = false;
@@ -383 +393 @@
         // Open original DBC file
         $SourceDBCFile = new DBCFile();
-        $SourceDBCFile->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
+        $SourceDBCFile->OpenFile($SourceDbcFileName, $ColumnFormat);
 
         // Create new DBC file
-        if (!file_exists($this->TempDir.'dbc/')) mkdir($this->TempDir.'dbc/', 0777, true);
+        $DbcDir = $this->TempDir.'dbc/';
+        if (!file_exists($DbcDir)) mkdir($DbcDir, 0777, true);
         $NewDBCFile = new DBCFile();
-        $NewDBCFile->CreateFile($this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
+        $NewDBCFile->CreateFile($DbcDir.$Group['DBCFileName'].'.dbc', $ColumnFormat);
         $NewDBCFile->SetRecordCount($SourceDBCFile->GetRecordCount());
         $NewDBCFile->SetFieldCount($SourceDBCFile->GetFieldCount());
@@ -436 +447 @@
         }
         $NewDBCFile->Commit();
-      } else $Output .= ShowMessage('Zdrojový soubor '.$this->SourceDirRelative.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n", MESSAGE_CRITICAL);
+      } else $Output .= ShowMessage('Zdrojový soubor '.$SourceDbcFileName.' nenalezen.'."\n", MESSAGE_CRITICAL);
     }
     $Output .= 'Hotovo <br />';
@@ -442 +453 @@
   }
 
-  function ExportToLua()
+  function ExportToLua(): string
   {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
@@ -449 +460 @@
 
     $Output = '';
-    if (!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
+    $LuaDir = $this->TempDir.'lua/';
+    if (!file_exists($LuaDir)) mkdir($LuaDir, 0777, true);
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`LuaFileName` != ""');
     while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(1);
-    //  $this->AddProgress();
       $Output .= $Group['Name'].'... ';
       $File = new FileStream();
-      if (!file_exists($this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua'))
+      $SourceLuaFileName = $this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua';
+      if (!file_exists($SourceLuaFileName)) 
+      {
         continue;
-      $File->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
+      }
+      $File->OpenFile($SourceLuaFileName);
       $File2 = new FileStream();
-      $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
+      $File2->CreateFile($LuaDir.$Group['LuaFileName'].'.lua');
 
       $LookupTable = array();
@@ -722 +736 @@
     if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
     $Buffer .= "  </translation>\n".
-  "</document>";
+      '</document>';
     return $Buffer;
   }

trunk/Modules/Export/ExportOutput.php

@@ -213 +213 @@
   if ($DbResult->num_rows == 0)
   {
-    $System->Database->query('INSERT INTO `ExportTask` (`Export` ,`TimeQueued` ) VALUES ('.$ExportId.', NOW())');
+    $System->Database->query('INSERT INTO `ExportTask` (`Export` ,`TimeQueued`, `Progress` ) VALUES ('.$ExportId.', NOW(), 0)');
     $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování DBC souboru', LOG_TYPE_DOWNLOAD);
     $System->Database->query('UPDATE `ExportTask` SET `Progress`=0 WHERE `Export`='.$Export->Id);

trunk/Modules/Export/Page.php

@@ -39 +39 @@
 
     $Output .= '<h3>'.T('List of export').'</h3>'.
-        $PageList['Output'];
+      $PageList['Output'];
 
     $TableColumns = array(
-        array('Name' => 'TimeCreate', 'Title' => T('Time made')),
-        array('Name' => 'UserName', 'Title' => T('Translator')),
-        array('Name' => 'Title', 'Title' => T('Name od export')),
-        //  array('Name' => 'UserCount', 'Title' => 'Vybraných překladatelů'),
-        //  array('Name' => 'GroupCount', 'Title' => 'Překladových skupin'),
-        array('Name' => 'OutputType', 'Title' => T('Type of output')),
-        array('Name' => 'ClientVersion', 'Title' => T('Client version')),
-        array('Name' => 'UsedCount', 'Title' => T('Viewed count')),
-        array('Name' => '', 'Title' => T('Action')),
+      array('Name' => 'TimeCreate', 'Title' => T('Time made')),
+      array('Name' => 'UserName', 'Title' => T('Translator')),
+      array('Name' => 'Title', 'Title' => T('Name od export')),
+      //  array('Name' => 'UserCount', 'Title' => 'Vybraných překladatelů'),
+      //  array('Name' => 'GroupCount', 'Title' => 'Překladových skupin'),
+      array('Name' => 'OutputType', 'Title' => T('Type of output')),
+      array('Name' => 'ClientVersion', 'Title' => T('Client version')),
+      array('Name' => 'UsedCount', 'Title' => T('Viewed count')),
+      array('Name' => '', 'Title' => T('Action')),
     );
     $Order = GetOrderTableHeader($TableColumns, 'TimeCreate', 1);
     $Output .= '<table class="BaseTable">'.
-        $Order['Output'];
+      $Order['Output'];
 
     $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, '.
@@ -70 +70 @@
       if ($User->Id != null) $Action .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a>';
       $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
-          '<td><a href="'.$this->System->Link('/user/?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
-          '<td>'.htmlspecialchars($Export['Title']).'</td>'.
-          '<td>'.$Export['OutputType'].'</td>'.
-          '<td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$Export['ClientVersionId']).'">'.$Export['ClientVersion'].'</a></td>'.
-          '<td>'.$Export['UsedCount'].'</td>'.
-          '<td>'.$Action.'</td></tr>';
+        '<td><a href="'.$this->System->Link('/user/?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
+        '<td>'.htmlspecialchars($Export['Title']).'</td>'.
+        '<td>'.$Export['OutputType'].'</td>'.
+        '<td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$Export['ClientVersionId']).'">'.$Export['ClientVersion'].'</a></td>'.
+        '<td>'.$Export['UsedCount'].'</td>'.
+        '<td>'.$Action.'</td></tr>';
     }
     $Output .= '</table>'.
-        $PageList['Output'];
+      $PageList['Output'];
 
     return $Output;
@@ -93 +93 @@
       {
         $Output = '<form action="?Action=CreateFinish" method="post">'.
-            '<fieldset><legend>'.T('Creation of new export').'</legend>'.
-            '<table><tr><td>'.T('Identification').':</td><td><input type="text" name="Title" /></td></tr>'.
-            '<tr><td>'.T('Description').':</td><td><textarea name="Description" cols="54" rows="10"></textarea></td></tr>'.
-            '<tr><td colspan="2"><input type="submit" value="'.T('Create').'" /></td></tr>'.
-            '</table></fieldset></form>';
+          '<fieldset><legend>'.T('Creation of new export').'</legend>'.
+          '<table><tr><td>'.T('Identification').':</td><td><input type="text" name="Title" /></td></tr>'.
+          '<tr><td>'.T('Description').':</td><td><textarea name="Description" cols="54" rows="10"></textarea></td></tr>'.
+          '<tr><td colspan="2"><input type="submit" value="'.T('Create').'" /></td></tr>'.
+          '</table></fieldset></form>';
       } else $Output = ShowMessage(sprintf(T('You can\'t create another export. Max for one user is %d.'), Core::Cast($this->System)->Config['MaxExportPerUser']), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
@@ -152 +152 @@
   function SaveAllUsers()
   {
-   global $System;
-      $Export = new Export($System);
-      $Export->Id = $_GET['ExportId'];
-      $Export->SaveAllUsers();
-
+    $Export = new Export($this->System);
+    $Export->Id = $_GET['ExportId'];
+    $Export->SaveAllUsers();
   }
 
@@ -162 +160 @@
   {
     $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
     $Output = '';
@@ -174 +171 @@
     {
       if ($_POST['Operation'] == 'Save')
-      {
-        //print_r($_POST);
+      {        
         // Update user selection page
         foreach ($_POST as $Index => $Value)
@@ -197 +193 @@
         }
 
-        if (array_key_exists('AllUsers', $_POST)) {
-            //add allusers to export
-            $this->System->Database->query('UPDATE `Export` SET `AllUsers`=1 WHERE `Id`='.$_GET['ExportId']);
-
-            //update export stat
-            $Export['AllUsers'] = 1;
-            $this->SaveAllUsers();
-          } else {
-            //update export stat
-            $Export['AllUsers'] = 0;
-            $this->System->Database->query('UPDATE `Export` SET `AllUsers`=0 WHERE `Id`='.$_GET['ExportId']);
-          }
+        if (array_key_exists('AllUsers', $_POST)) 
+        {
+          //add allusers to export
+          $this->System->Database->query('UPDATE `Export` SET `AllUsers`=1 WHERE `Id`='.$_GET['ExportId']);
+
+          //update export stat
+          $Export['AllUsers'] = 1;
+          $this->SaveAllUsers();
+        } else 
+        {
+          //update export stat
+          $Export['AllUsers'] = 0;
+          $this->System->Database->query('UPDATE `Export` SET `AllUsers`=0 WHERE `Id`='.$_GET['ExportId']);
+        }
 
         // Recalculate sequence number
@@ -218 +216 @@
 
     $TableColumns = array(
-        array('Name' => 'Name', 'Title' => T('Name')),
-        array('Name' => 'TranslatedCount', 'Title' => T('Translated count')),
-        array('Name' => 'XP', 'Title' => T('Level')),
-        array('Name' => 'XP', 'Title' => T('Experience')),
-        array('Name' => '', 'Title' => T('Select')),
-        array('Name' => 'Sequence2', 'Title' => T('Order')),
+      array('Name' => 'Name', 'Title' => T('Name')),
+      array('Name' => 'TranslatedCount', 'Title' => T('Translated count')),
+      array('Name' => 'XP', 'Title' => T('Level')),
+      array('Name' => 'XP', 'Title' => T('Experience')),
+      array('Name' => '', 'Title' => T('Select')),
+      array('Name' => 'Sequence2', 'Title' => T('Order')),
     );
     $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
     if ($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
-    else $InitialOrder = '';
+      else $InitialOrder = '';
 
     $Query = 'SELECT (@I := @I + 1) AS `Sequence2`, `TT`.* FROM (SELECT `ExportUser`.`Sequence`, `T`.`ID`, `T`.`TranslatedCount`, `T`.`Name`, `T`.`XP` FROM (SELECT `User`.`ID`, `User`.`Name`, `User`.`XP`, `TranslatedCount` FROM `User`) AS T';
@@ -238 +236 @@
 
     $Output .= '<form name="Translators" action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-        '<h3>'.T('Translators').'</h3>';
+      '<h3>'.T('Translators').'</h3>';
     if ($Editable)
     {
       $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
-          '<input type="hidden" name="Operation" value="Save"/><br />'.
-          ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' '.T('Select all on page').'</span> <br />'.
-          ' <span>'.CheckBox('AllUsers', $Export['AllUsers']).' '.T('Export allways from all users').'</span> '.
-          '<br />'.
-          T('Select users from list which you want to export from. And edit their order.').'<br />'.
-          T('Order is done by numeric value which is can be edit to desirable order. Lines with same number will be renumbered in ascending order.');
+        '<input type="hidden" name="Operation" value="Save"/><br />'.
+        ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' '.T('Select all on page').'</span> <br />'.
+        ' <span>'.CheckBox('AllUsers', $Export['AllUsers']).' '.T('Export allways from all users').'</span> '.
+        '<br />'.
+        T('Select users from list which you want to export from. And edit their order.').'<br />'.
+        T('Order is done by numeric value which is can be edit to desirable order. Lines with same number will be renumbered in ascending order.');
     }
 
@@ -264 +262 @@
       $Sequence = '<input type="text" name="seq'.$UserLine['ID'].'" style="text-align: center; width: 40px;" value="'.$UserLine['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
       $Output .= '<tr>'.
-          '<td><a href="'.$this->System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0').'" title="Zobrazit všechny jeho přeložené texty">'.$UserLine['Name'].'</a></td>'.
-          '<td>'.$UserLine['TranslatedCount'].'</td>'.
-          '<td>'.$XP['Level'].'</td>'.
-          '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
-          '<td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>';
+        '<td><a href="'.$this->System->Link('/TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0').'" title="Zobrazit všechny jeho přeložené texty">'.$UserLine['Name'].'</a></td>'.
+        '<td>'.$UserLine['TranslatedCount'].'</td>'.
+        '<td>'.$XP['Level'].'</td>'.
+        '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
+        '<td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>';
     }
     $Output .= '</table>'.
-        '</form>'.
-        $PageList['Output'];
+      '</form>'.
+      $PageList['Output'];
     return $Output;
   }
@@ -288 +286 @@
 
     if (array_key_exists('Operation', $_POST))
+    {
       if ($_POST['Operation'] == 'Save')  if ($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
       {
@@ -301 +300 @@
         $Output .= ShowMessage('Nastavení uloženo.');
       }
-
-      if ($Export['WithDiacritic'] == 1) $WithDiacritic = ' checked="checked"';
+    }
+
+    if ($Export['WithDiacritic'] == 1) $WithDiacritic = ' checked="checked"';
       else $WithDiacritic = '';
-      $Output .= '<form action="?Action=View&amp;Tab=0&amp;ExportId='.$Export['Id'].'" method="post">'.
-          '<table>';
-      if ($User->Id != null)
-      {
-        $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
-            '<tr><td colspan="2">';
-        if ($Editable) $Output .= ' <input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>';
-        $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a> ';
-        if ($User->Licence(LICENCE_ADMIN))
-          $Output .= CheckBox('Featured', $Export['Featured'], '', 'CheckBox', !$Editable). ' '.T('Recommended').' ';
-        $Output .= '</td></tr>';
-      }
-      $Output .= '<tr><td>'.T('Identification').':</td><td><input type="text" style="width: 400px" name="Title" value="'.htmlspecialchars($Export['Title']).'"'.$DisabledInput[$Editable].'/></td></tr>'.
-          '<tr><td>'.T('Description').':</td><td><textarea name="Description" cols="54" rows="10"'.$DisabledTextArea[$Editable].'>'.htmlspecialchars($Export['Description']).'</textarea></td></tr>'.
-          '<tr><td>'.T('With diacritics').'</td><td><input type="checkbox" name="WithDiacritic" '.$WithDiacritic.''.$DisabledInput[$Editable].'/></td></tr>'.
-          '</table></form>';
-      return $Output;
+    $Output .= '<form action="?Action=View&amp;Tab=0&amp;ExportId='.$Export['Id'].'" method="post">'.
+      '<table>';
+    if ($User->Id != null)
+    {
+      $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
+        '<tr><td colspan="2">';
+      if ($Editable) $Output .= ' <input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>';
+      $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a> ';
+      if ($User->Licence(LICENCE_ADMIN))
+        $Output .= CheckBox('Featured', $Export['Featured'], '', 'CheckBox', !$Editable). ' '.T('Recommended').' ';
+      $Output .= '</td></tr>';
+    }
+    $Output .= '<tr><td>'.T('Identification').':</td><td><input type="text" style="width: 400px" name="Title" value="'.htmlspecialchars($Export['Title']).'"'.$DisabledInput[$Editable].'/></td></tr>'.
+      '<tr><td>'.T('Description').':</td><td><textarea name="Description" cols="54" rows="10"'.$DisabledTextArea[$Editable].'>'.htmlspecialchars($Export['Description']).'</textarea></td></tr>'.
+      '<tr><td>'.T('With diacritics').'</td><td><input type="checkbox" name="WithDiacritic" '.$WithDiacritic.''.$DisabledInput[$Editable].'/></td></tr>'.
+      '</table></form>';
+    return $Output;
   }
 
@@ -326 +326 @@
   {
     $User = ModuleUser::Cast($this->System->GetModule('User'))->User;
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
     $Output = '';
@@ -339 +338 @@
       if ($_POST['Operation'] == 'Save')
       {
-        //print_r($_POST);
         // Update user selection page
         foreach ($_POST as $Index => $Value)
@@ -377 +375 @@
 
     $TableColumns = array(
-        array('Name' => 'Name', 'Title' => T('Name')),
-        array('Name' => '', 'Title' => T('Select')),
-        array('Name' => 'Sequence2', 'Title' => T('Order')),
+      array('Name' => 'Name', 'Title' => T('Name')),
+      array('Name' => '', 'Title' => T('Select')),
+      array('Name' => 'Sequence2', 'Title' => T('Order')),
     );
     $Order = GetOrderTableHeader($TableColumns, 'Sequence2');
@@ -394 +392 @@
 
     $Output .= $PageList['Output'].
-    '<table class="BaseTable">'.
+      '<table class="BaseTable">'.
     $Order['Output'];
 
@@ -410 +408 @@
     }
     $Output .= '</table>'.
-        '</form>'.
-        $PageList['Output'];
+      '</form>'.
+      $PageList['Output'];
     return $Output;
   }
@@ -425 +423 @@
     $Export = $DbRows->fetch_assoc();
     if ($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
-    else $Editable = false;
+      else $Editable = false;
 
     if (array_key_exists('Operation', $_POST))
     {
       if ($_POST['Operation'] == 'Save')
-      {
-        //print_r($_POST);
+      {        
         // Update user selection page
         foreach ($_POST as $Index => $Value)
@@ -459 +456 @@
           if (array_key_exists('item'.$Column['Id'], $_POST)) $Selected = true;
           else $Selected = false;
-          //we will save only forbitten collums and need to be visible
+          // we will save only forbitten collums and need to be visible
           $Selected = !$Selected;
           if (!$Column['Visible']) $Selected = false;
 
-            $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `GroupItem`='.$Column['Id'];
-            $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroupItem` '.$Condition);
-            if ($DbResult->num_rows > 0)
-            {
-              if (!$Selected) $this->System->Database->query('DELETE FROM `ExportGroupItem` '.$Condition);
-            } else
-            {
-              if ($Selected) $this->System->Database->query('INSERT INTO `ExportGroupItem` (`Export`, `GroupItem`) VALUES ('.$_GET['ExportId'].', '.$Column['Id'].')');
-            }
-
+          $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `GroupItem`='.$Column['Id'];
+          $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroupItem` '.$Condition);
+          if ($DbResult->num_rows > 0)
+          {
+            if (!$Selected) $this->System->Database->query('DELETE FROM `ExportGroupItem` '.$Condition);
+          } else
+          {
+            if ($Selected) $this->System->Database->query('INSERT INTO `ExportGroupItem` (`Export`, `GroupItem`) VALUES ('.$_GET['ExportId'].', '.$Column['Id'].')');
+          }
         }
       }
@@ -484 +480 @@
 
     $TableColumns = array(
-        array('Name' => '', 'Title' => T('Select')),
-        array('Name' => 'Name', 'Title' => T('Name')),
-        array('Name' => 'MangosTable', 'Title' => 'Mangos/DBC/Lua'),
-    //    array('Name' => 'DBCFileName', 'Title' => 'DBC soubor'),
-    //    array('Name' => 'LuaFileName', 'Title' => 'Lua soubor'),
-        array('Name' => '', 'Title' => T('Items of translation')),
+      array('Name' => '', 'Title' => T('Select')),
+      array('Name' => 'Name', 'Title' => T('Name')),
+      array('Name' => 'MangosTable', 'Title' => 'Mangos/DBC/Lua'),
+    //  array('Name' => 'DBCFileName', 'Title' => 'DBC soubor'),
+    //  array('Name' => 'LuaFileName', 'Title' => 'Lua soubor'),
+      array('Name' => '', 'Title' => T('Items of translation')),
     );
     $Order = GetOrderTableHeader($TableColumns, 'Name');
     $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-        '<h3>'.T('Translation groups').'</h3>';
+      '<h3>'.T('Translation groups').'</h3>';
     if ($Editable)
     {
       $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
-          '<input type="hidden" name="Operation" value="Save"/>'.
-          ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' '.T('Select all').'</span> '.
-          '<br />'.
-          T('Select translation groups witch you want to export.').'<br />';
+        '<input type="hidden" name="Operation" value="Save"/>'.
+        ' <span onclick="CheckAllCheckbox();">'.CheckBox('CheckAll', False, 'CheckAll').' '.T('Select all').'</span> '.
+        '<br />'.
+        T('Select translation groups witch you want to export.').'<br />';
     }
 
@@ -518 +514 @@
     {
       $Columns = '';
-      foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
+      foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) 
+      {
         if ($Column['Visible']) $Columns .= CheckBox('item'.$Column['Id'],
           !isset($GroupItems[$Column['Id']]), '', 'CheckBox', !$Editable).' '.T($Column['Name']).' <br/>';
@@ -525 +522 @@
       $Selection = CheckBox('sel'.$Group['Id'], $Checked, '', 'CheckBox', !$Editable);
       $Output .= '<tr>'.
-          '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td>'.
-          '<td>'.T($Group['Name']).'</td><td>';
-          if ($Group['MangosTable'] <> '')
-            $Output .= $Group['MangosTable'].'.sql ';
-          if ($Group['LuaFileName'] <> '')
-            $Output .= $Group['LuaFileName'].'.lua ';
-          if ($Group['DBCFileName'] <> '')
-            $Output .= $Group['DBCFileName'].'.dbc ';
+        '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td>'.
+        '<td>'.T($Group['Name']).'</td><td>';
+      if ($Group['MangosTable'] <> '')
+        $Output .= $Group['MangosTable'].'.sql ';
+      if ($Group['LuaFileName'] <> '')
+        $Output .= $Group['LuaFileName'].'.lua ';
+      if ($Group['DBCFileName'] <> '')
+        $Output .= $Group['DBCFileName'].'.dbc ';
 
       $Output .= '</td><td>';
@@ -556 +553 @@
         $Export = $DbRows->fetch_assoc();
         if ($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true;
-        else $Editable = false;
+          else $Editable = false;
 
         if (array_key_exists('Operation', $_POST))
+        {
           if ($_POST['Operation'] == 'Save')
           {
@@ -567 +565 @@
             } else $Output .= ShowMessage(T('Format wasn\'t selected'), MESSAGE_CRITICAL);
           }
-
-          $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-          $Export = $DbResult->fetch_assoc();
-
-          $Output .= '<h3>'.T('Format the generated output').'</h3>'.
-              '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">';
-          if ($Editable)
-          {
-            $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
-                '<input type="hidden" name="Operation" value="Save"/>'.
-                '<br />';
-          }
-          $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
-          while ($ExportFormat = $DbResult->fetch_assoc())
-          {
-            $Output .= RadioButton('OutputType', $ExportFormat['Id'], $Export['OutputType'] == $ExportFormat['Id'], '', !$Editable).' '.$ExportFormat['Name'].'<br/>';
-          }
-          $Output .= '</form>';
+        }
+
+        $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+        $Export = $DbResult->fetch_assoc();
+
+        $Output .= '<h3>'.T('Format the generated output').'</h3>'.
+          '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">';
+        if ($Editable)
+        {
+          $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
+            '<input type="hidden" name="Operation" value="Save"/>'.
+            '<br />';
+        }
+        $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` ORDER BY `Name`');
+        while ($ExportFormat = $DbResult->fetch_assoc())
+        {
+          $Output .= RadioButton('OutputType', $ExportFormat['Id'], $Export['OutputType'] == $ExportFormat['Id'], '', !$Editable).' '.$ExportFormat['Name'].'<br/>';
+        }
+        $Output .= '</form>';
       } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
@@ -601 +600 @@
 
     if (array_key_exists('Operation', $_POST))
+    {
       if (($_POST['Operation'] == 'Save') and (array_key_exists('ClientVersion', $_POST)))
       {
@@ -606 +606 @@
         $Output .= ShowMessage(T('Select saved.'));
       }
-
-      $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-      $Export = $DbResult->fetch_assoc();
-
-      if ($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
-      else {
-        $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` '.
-          'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
-
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
-        $DbRow = $DbResult->fetch_row();
-        $PageList = GetPageList($DbRow[0]);
-
-        $TableColumns = array(
-            array('Name' => 'Version', 'Title' => T('Version')),
-            array('Name' => 'BuildNumber', 'Title' => T('Build')),
-            array('Name' => 'ReleaseDate', 'Title' => T('Release date')),
-            array('Name' => 'Title', 'Title' => T('Name2')),
-            array('Name' => '', 'Title' => T('Select')),
-        );
-        $Order = GetOrderTableHeader($TableColumns, 'BuildNumber', 1);
-        $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-            '<h3>'.T('Client version').'</h3>';
-
-        if ($Editable)
-        {
-          $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
-              '<input type="hidden" name="Operation" value="Save"/>'.
-              '<br />'.
-              T('Select version of game client witch you want to export.').'<br />';
-        }
-        $Output .= $PageList['Output'].
-        '<table class="BaseTable">'.
-        $Order['Output'];
-
-        $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
-        $DbResult = $this->System->Database->query($Query);
-        while ($Version = $DbResult->fetch_assoc())
-        {
-          $Output .= '<tr><td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$Version['Id']).'">'.
-              $Version['Version'].'</a></td><td>'.$Version['BuildNumber'].'</td><td>'.
-              HumanDate($Version['ReleaseDate']).'</td><td>'.$Version['Title'].'</td><td>'.
-              RadioButton('ClientVersion', $Version['Id'], $Export['ClientVersion'] == $Version['Id'], '', !$Editable
-              ).'</td></tr>';
-
-        }
-        $Output .= '</table>'.
-            '</form>'.
-            $PageList['Output'];
-      }
-      return $Output;
+    }
+
+    $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $Export = $DbResult->fetch_assoc();
+
+    if ($Export['OutputType'] == '') 
+    {
+      $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
+    } else 
+    {
+      $Query = 'SELECT `ClientVersion`.* FROM `ExportVersion` '.
+        'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id`=`ExportVersion`.`ClientVersion` WHERE `ExportType`='.$Export['OutputType'];
+
+      $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
+      $DbRow = $DbResult->fetch_row();
+      $PageList = GetPageList($DbRow[0]);
+
+      $TableColumns = array(
+        array('Name' => 'Version', 'Title' => T('Version')),
+        array('Name' => 'BuildNumber', 'Title' => T('Build')),
+        array('Name' => 'ReleaseDate', 'Title' => T('Release date')),
+        array('Name' => 'Title', 'Title' => T('Name2')),
+        array('Name' => '', 'Title' => T('Select')),
+      );
+      $Order = GetOrderTableHeader($TableColumns, 'BuildNumber', 1);
+      $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
+        '<h3>'.T('Client version').'</h3>';
+
+      if ($Editable)
+      {
+        $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
+          '<input type="hidden" name="Operation" value="Save"/>'.
+          '<br />'.
+          T('Select version of game client witch you want to export.').'<br />';
+      }
+      $Output .= $PageList['Output'].
+      '<table class="BaseTable">'.
+      $Order['Output'];
+
+      $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
+      $DbResult = $this->System->Database->query($Query);
+      while ($Version = $DbResult->fetch_assoc())
+      {
+        $Output .= '<tr><td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$Version['Id']).'">'.
+          $Version['Version'].'</a></td><td>'.$Version['BuildNumber'].'</td><td>'.
+          HumanDate($Version['ReleaseDate']).'</td><td>'.$Version['Title'].'</td><td>'.
+          RadioButton('ClientVersion', $Version['Id'], $Export['ClientVersion'] == $Version['Id'], '', !$Editable
+          ).'</td></tr>';
+      }
+      $Output .= '</table>'.
+        '</form>'.
+        $PageList['Output'];
+    }
+    return $Output;
   }
 
@@ -666 +669 @@
     if ($Export['OutputType'] == '') $Output .= ShowMessage('Nevybrán typ exportu', MESSAGE_CRITICAL);
     else if ($Export['ClientVersion'] == '') $Output .= ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
-    else {
+    else 
+    {
       $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
       if ($DbResult->num_rows > 0)
@@ -691 +695 @@
     if (($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == ''))
       $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
-    else {
+    else 
+    {
       $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
-          ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
+        ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
       $Query = '';
       $UnionItems = array();
@@ -700 +705 @@
       {
         $UnionItems[] = 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
-            ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$Export->Id.') '.
-            ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$Export->Id.')'.
-            ' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
-            ') AS `C1`) AS `Translated`, '.
-            '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-            ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
-            ' WHERE (`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
-            ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name`';
+          ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
+          ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$Export->Id.') '.
+          ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$Export->Id.')'.
+          ' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
+          ') AS `C1`) AS `Translated`, '.
+          '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+          ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
+          ' WHERE (`Language` = '.Core::Cast($this->System)->Config['OriginalLanguage'].') AND (`VersionStart` <= '.$Export->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$Export->ClientVersion['BuildNumber'].')'.
+          ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name`';
       }
       $Query = substr($Query, 0, - 6);

trunk/Modules/Export/ProcessTask.php

@@ -37 +37 @@
   {
     if (file_exists($dst)) $this->DeleteOldFiles($dst);
-    if (is_dir($src)) {
+    if (is_dir($src)) 
+    {
       if (!file_exists($dst)) mkdir($dst, 0777, true);
       $files = scandir($src);
       foreach ($files as $file)
-      if ($file != "." and $file != ".." and (!is_dir($src.'/'.$file))) $this->rcopy($src.'/'.$file, $dst.'/'.$file);
+      {
+        if (($file != ".") and ($file != "..") and (!is_dir($src.'/'.$file))) 
+          $this->rcopy($src.'/'.$file, $dst.'/'.$file);
+      }
     }
     else if (file_exists($src)) copy($src, $dst);
@@ -117 +121 @@
     if (function_exists('gzcompress'))
     {
-      $Export->ExportToDBC();
+      echo(strip_tags($Export->ExportToDBC()));
       echo('Komprese...'."\n");
-      exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$Export->TempDir.'dbc/');
+      $SourceDir = $Export->TempDir.'dbc/';
+      if (file_exists($SourceDir))
+      {
+        exec('zip -r -j '.$Export->TempDir.'CzWoW_DBC.zip '.$SourceDir);
+      } else echo('Directory doesn\'t exist '.$SourceDir);
       $this->SetProgress(80);
     } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");

trunk/Modules/Export/files/1.12.1/install.nsi

@@ -12 +12 @@
 ;not use  !define RELEASE_DATE "2010-04-23"
   !define TITLE "CzechWoW"
-  !define FULL_TITLE "Èeský pøeklad WoW"
+  !define FULL_TITLE "Český překlad WoW"
   !define CREATOR "Autor"
   !define README "ReadMe.htm"
@@ -137 +137 @@
   SetOutPath "$INSTDIR"  
   CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Odinstalovat.lnk" "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
- 
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápovìda.lnk" "$INSTDIR\${README}"
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\České WoW.lnk" "$INSTDIR\WowLua.exe"
+ 
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápověda.lnk" "$INSTDIR\${README}"
  
 SectionEnd
@@ -149 +149 @@
   SetDetailsPrint listonly
  
-  CreateShortCut "$DESKTOP\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
+  CreateShortCut "$DESKTOP\České WoW.lnk" "$INSTDIR\WowLua.exe"
  
 SectionEnd
@@ -156 +156 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Zobrazuji doplòující informace..."
+  DetailPrint "Zobrazuji doplňující informace..."
   SetDetailsPrint listonly
  
@@ -166 +166 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Mažu WDB cache..."
+  DetailPrint "Mažu WDB cache..."
   SetDetailsPrint listonly
  
@@ -192 +192 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
     !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Pøeloží Rozhraní, Kouzla, Herní tipy, Úspìchy, Místa, Rasy postav aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Pøidá zástupce do Nabídky start pro snadné použití"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Pøidá zástupce na plochu"
+    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Přeloží Rozhraní, Kouzla, Herní tipy, Úspěchy, Místa, Rasy postav aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Přeloží Výpravy, Slova NPC, Knížky aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Přidá zástupce do Nabídky start pro snadné použití"
+    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Přidá zástupce na plochu"
     !insertmacro MUI_DESCRIPTION_TEXT ${ShowChangeLog} "Zobrazí informace o vydání"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací pamì v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty pøijaté ze serveru. Pøi zmìnì pøipojení mezi servery anglickými a èeskými servery je potøeba obsah této složky vymazat."
+    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací paměť v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty přijaté ze serveru. Při změně připojení mezi servery anglickými a českými servery je potřeba obsah této složky vymazat."
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
  

trunk/Modules/Export/files/2.4.3/install.nsi

@@ -12 +12 @@
 ;not use  !define RELEASE_DATE "2010-04-23"
   !define TITLE "CzechWoW"
-  !define FULL_TITLE "Èeský pøeklad WoW"
+  !define FULL_TITLE "Český překlad WoW"
   !define CREATOR "Autor"
   !define README "ReadMe.htm"
@@ -137 +137 @@
   SetOutPath "$INSTDIR"  
   CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Odinstalovat.lnk" "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
- 
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápovìda.lnk" "$INSTDIR\${README}"
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\České WoW.lnk" "$INSTDIR\WowLua.exe"
+ 
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápověda.lnk" "$INSTDIR\${README}"
  
 SectionEnd
@@ -149 +149 @@
   SetDetailsPrint listonly
  
-  CreateShortCut "$DESKTOP\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
+  CreateShortCut "$DESKTOP\České WoW.lnk" "$INSTDIR\WowLua.exe"
  
 SectionEnd
@@ -156 +156 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Zobrazuji doplòující informace..."
+  DetailPrint "Zobrazuji doplňující informace..."
   SetDetailsPrint listonly
  
@@ -166 +166 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Mažu WDB cache..."
+  DetailPrint "Mažu WDB cache..."
   SetDetailsPrint listonly
  
@@ -192 +192 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
     !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Pøeloží Rozhraní, Kouzla, Herní tipy, Úspìchy, Místa, Rasy postav aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Pøidá zástupce do Nabídky start pro snadné použití"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Pøidá zástupce na plochu"
+    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Přeloží Rozhraní, Kouzla, Herní tipy, Úspěchy, Místa, Rasy postav aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Přeloží Výpravy, Slova NPC, Knížky aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Přidá zástupce do Nabídky start pro snadné použití"
+    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Přidá zástupce na plochu"
     !insertmacro MUI_DESCRIPTION_TEXT ${ShowChangeLog} "Zobrazí informace o vydání"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací pamì v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty pøijaté ze serveru. Pøi zmìnì pøipojení mezi servery anglickými a èeskými servery je potøeba obsah této složky vymazat."
+    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací paměť v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty přijaté ze serveru. Při změně připojení mezi servery anglickými a českými servery je potřeba obsah této složky vymazat."
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
  

trunk/Modules/Export/files/3.3.5a/install.nsi

@@ -12 +12 @@
 ;not use  !define RELEASE_DATE "2010-04-23"
   !define TITLE "CzechWoW"
-  !define FULL_TITLE "Èeský pøeklad WoW"
+  !define FULL_TITLE "Český překlad WoW"
   !define CREATOR "Autor"
   !define README "ReadMe.htm"
@@ -137 +137 @@
   SetOutPath "$INSTDIR"  
   CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Odinstalovat.lnk" "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
- 
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápovìda.lnk" "$INSTDIR\${README}"
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\České WoW.lnk" "$INSTDIR\WowLua.exe"
+ 
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápověda.lnk" "$INSTDIR\${README}"
  
 SectionEnd
@@ -149 +149 @@
   SetDetailsPrint listonly
  
-  CreateShortCut "$DESKTOP\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
+  CreateShortCut "$DESKTOP\České WoW.lnk" "$INSTDIR\WowLua.exe"
  
 SectionEnd
@@ -156 +156 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Zobrazuji doplòující informace..."
+  DetailPrint "Zobrazuji doplňující informace..."
   SetDetailsPrint listonly
  
@@ -166 +166 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Mažu WDB cache..."
+  DetailPrint "Mažu WDB cache..."
   SetDetailsPrint listonly
  
@@ -192 +192 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
     !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Pøeloží Rozhraní, Kouzla, Herní tipy, Úspìchy, Místa, Rasy postav aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Pøidá zástupce do Nabídky start pro snadné použití"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Pøidá zástupce na plochu"
+    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Přeloží Rozhraní, Kouzla, Herní tipy, Úspěchy, Místa, Rasy postav aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Přeloží Výpravy, Slova NPC, Knížky aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Přidá zástupce do Nabídky start pro snadné použití"
+    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Přidá zástupce na plochu"
     !insertmacro MUI_DESCRIPTION_TEXT ${ShowChangeLog} "Zobrazí informace o vydání"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací pamì v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty pøijaté ze serveru. Pøi zmìnì pøipojení mezi servery anglickými a èeskými servery je potøeba obsah této složky vymazat."
+    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací paměť v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty přijaté ze serveru. Při změně připojení mezi servery anglickými a českými servery je potřeba obsah této složky vymazat."
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
  

trunk/Modules/Export/files/4.3.4/install.nsi

@@ -12 +12 @@
 ;not use  !define RELEASE_DATE "2010-04-23"
   !define TITLE "CzechWoW"
-  !define FULL_TITLE "Èeský pøeklad WoW"
+  !define FULL_TITLE "Český překlad WoW"
   !define CREATOR "Autor"
   !define README "ReadMe.htm"
@@ -138 +138 @@
   SetOutPath "$INSTDIR"  
   CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Odinstalovat.lnk" "$INSTDIR\Uninstall.exe"
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
- 
-  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápovìda.lnk" "$INSTDIR\${README}"
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\České WoW.lnk" "$INSTDIR\WowLua.exe"
+ 
+  CreateShortCut "$SMPROGRAMS\${FULL_TITLE}\Nápověda.lnk" "$INSTDIR\${README}"
  
 SectionEnd
@@ -150 +150 @@
   SetDetailsPrint listonly
  
-  CreateShortCut "$DESKTOP\Èeské WoW.lnk" "$INSTDIR\WowLua.exe"
+  CreateShortCut "$DESKTOP\České WoW.lnk" "$INSTDIR\WowLua.exe"
  
 SectionEnd
@@ -157 +157 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Zobrazuji doplòující informace..."
+  DetailPrint "Zobrazuji doplňující informace..."
   SetDetailsPrint listonly
  
@@ -167 +167 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Mažu WDB cache..."
+  DetailPrint "Mažu WDB cache..."
   SetDetailsPrint listonly
  
@@ -193 +193 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
     !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Pøeloží Rozhraní, Kouzla, Herní tipy, Úspìchy, Místa, Rasy postav aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."
-    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Pøidá zástupce do Nabídky start pro snadné použití"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Pøidá zástupce na plochu"
+    !insertmacro MUI_DESCRIPTION_TEXT ${Interface} "Přeloží Rozhraní, Kouzla, Herní tipy, Úspěchy, Místa, Rasy postav aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Přeloží Výpravy, Slova NPC, Knížky aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuShortCut} "Přidá zástupce do Nabídky start pro snadné použití"
+    !insertmacro MUI_DESCRIPTION_TEXT ${DesktopShortCut} "Přidá zástupce na plochu"
     !insertmacro MUI_DESCRIPTION_TEXT ${ShowChangeLog} "Zobrazí informace o vydání"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací pamì v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty pøijaté ze serveru. Pøi zmìnì pøipojení mezi servery anglickými a èeskými servery je potøeba obsah této složky vymazat."
+    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací paměť v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty přijaté ze serveru. Při změně připojení mezi servery anglickými a českými servery je potřeba obsah této složky vymazat."
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
  

trunk/Modules/Export/files/5.4.0/install.nsi

@@ -12 +12 @@
 ;not use  !define RELEASE_DATE "2010-04-23"
   !define TITLE "CzechWoW"
-  !define FULL_TITLE "Èeský pøeklad WoW"
+  !define FULL_TITLE "Český překlad WoW"
   !define CREATOR "Autor"
   !define README "ReadMe.htm"
@@ -119 +119 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Zobrazuji doplòující informace..."
+  DetailPrint "Zobrazuji doplňující informace..."
   SetDetailsPrint listonly
  
@@ -129 +129 @@
  
   SetDetailsPrint textonly
-  DetailPrint "Mažu WDB cache..."
+  DetailPrint "Mažu WDB cache..."
   SetDetailsPrint listonly
  
@@ -155 +155 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${Base} "Základní soubory"
     !insertmacro MUI_DESCRIPTION_TEXT ${Fonts} "Fonty do hry, pro správné zobrazování diakritiky"
-    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Pøeloží Výpravy, Slova NPC, Knížky aj."
+    !insertmacro MUI_DESCRIPTION_TEXT ${Addon} "Přeloží Výpravy, Slova NPC, Knížky aj."
     !insertmacro MUI_DESCRIPTION_TEXT ${ShowChangeLog} "Zobrazí informace o vydání"
-    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací pamì v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty pøijaté ze serveru. Pøi zmìnì pøipojení mezi servery anglickými a èeskými servery je potøeba obsah této složky vymazat."
+    !insertmacro MUI_DESCRIPTION_TEXT ${DeleteWDBCache} "Smaže vyrovnávací paměť v podsložece cache\WDB ve složce hry. Ve zde ukládaných souborech se uchovávají anglické texty přijaté ze serveru. Při změně připojení mezi servery anglickými a českými servery je potřeba obsah této složky vymazat."
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
  

trunk/Modules/Import/Import.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/../../includes/dbc.php');
 include_once(dirname(__FILE__).'/Manage.php');
-
 
 class ModuleImport extends Module
@@ -38 +37 @@
   function SetVersion($Version)
   {
-    global $System;
-
-    $DbResult = $System->Database->query('SELECT * FROM `ClientVersion` WHERE `Version` = "'.$Version.'"');
+    $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion` WHERE `Version` = "'.$Version.'"');
     $this->Version = $DbResult->fetch_assoc();
   }
@@ -68 +65 @@
       $DbRowBefore = $DbResultBefore->fetch_assoc();
 
-      if ($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0) )
+      if ($this->HaveSameText($this->Group, $DbRowBefore, $Value) and ($DbResultBefore->num_rows > 0))
       {
           $insert = false;
-          if ($this->Group['Id'] == 1) {
+          if ($this->Group['Id'] == 1) 
+          {
              $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
           } else $set = '';
@@ -80 +78 @@
       if ($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0))
       {
-          $insert = false;
-          if ($this->Group['Id'] == 1) {
-             $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
-          } else $set = '';
-          $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" '.$set.' WHERE `ID`='.$DbRowAfter['ID']);
-          echo('a ');
-
+        $insert = false;
+        if ($this->Group['Id'] == 1) 
+        {
+          $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
+        } else $set = '';
+        $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionStart` = "'.$this->Version['BuildNumber'].'" '.$set.' WHERE `ID`='.$DbRowAfter['ID']);
+        echo('a ');
       } else
       {
-
-        if (isset($DbRowAfter['VersionStart'])) {
-          if ($DbRowAfter['VersionStart'] <= $this->Version['BuildNumber']) {
+        if (isset($DbRowAfter['VersionStart'])) 
+        {
+          if ($DbRowAfter['VersionStart'] <= $this->Version['BuildNumber']) 
+          {
             echo('Allready imported '.$DbRowBefore['Entry'].' ');
             $insert = false;
           }
         }
-        if (isset($DbRowBefore['VersionEnd'])) {
-          if ($DbRowBefore['VersionEnd'] >= $this->Version['BuildNumber']) {
+        if (isset($DbRowBefore['VersionEnd'])) 
+        {
+          if ($DbRowBefore['VersionEnd'] >= $this->Version['BuildNumber']) 
+          {
             echo('Allready imported '.$DbRowBefore['Entry'].' ');
             $inserted = false;
@@ -103 +104 @@
         }
 
-            //if [DEPRECATED] do not import
-        foreach ($this->Group['Items'] as $GroupItem) {
-          if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED')) {
+        // if [DEPRECATED] do not import
+        foreach ($this->Group['Items'] as $GroupItem) 
+        {
+          if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED')) 
+          {
             echo('d '.$DbRowBefore['Entry'].' ');
             $insert = false;
@@ -111 +114 @@
         }
 
-        if ($insert) {
+        if ($insert) 
+        {
           $insert = false;
           foreach ($this->Group['Items'] as $GroupItem)
@@ -125 +129 @@
         if ($insert)
         {
-
           $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
           $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
@@ -135 +138 @@
           $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
 
-          echo '
+          echo('
           '.$Value['Entry'].' = '.$DbRowBefore['VersionStart'].'.'.$DbRowBefore['VersionEnd'].'< '.$this->Version['BuildNumber'].' <'.$DbRowAfter['VersionStart'].'.'.$DbRowAfter['VersionEnd'].'... '.$DbRowMiddle['VersionStart'].' '.$DbRowMiddle['VersionEnd'].'
-          ';
+          ');
 
           if (false !== strpos($Values,'[DEPRECATED'))
-          echo $Values;
+          echo($Values);
 
           echo('# ');
@@ -171 +174 @@
         if ($Value[$GroupItem['Column']] <> '') $insert = true;
       }
-      if ($insert) {
+      if ($insert) 
+      {
         $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
         $InsertId = $this->System->Database->insert_id;
@@ -183 +187 @@
   function ImportLUA()
   {
-    global $PatchVersion;
-
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = 'Načítání textů z LUA souboru...';
 
     if (($this->Group['LuaFileName'] != '') and ($this->Group['TablePrefix'] != ''))
     {
-
-        $Output .= '<br />'.$this->Group['Name'].'<br />';
+      $Output .= '<br />'.$this->Group['Name'].'<br />';
       //  if ($this->Group['LastVersion'] < $this->Version['BuildNumber'] + 1)
-        {
-          $File = new FileStream();
-
-          $File->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/lua/'.$this->Group['LuaFileName'].'.lua');
-          $this->NewItemCount = 0;
-          $Count = 0;
-          while (!$File->EOF())
-          {
-            $Line = $File->ReadLine();
-            if (strpos($Line, '=') !== false)
-            {
-              $LineParts = explode('=', $Line, 2);
-              $Value['ShortCut'] = trim($LineParts[0]);
-              $Line = trim($LineParts[1]);
-              if ($Line[0] == '"')
-              {
-                // Quoted string value
-                $Line = substr($Line, 1); // Skip start qoute
-                $TempLine = str_replace('\"', '  ', $Line); // Temporary remove slashed quotes
-                $Value['Text'] = substr($Line, 0, strpos($TempLine, '"'));
-                $Value['Text'] = str_replace('\n', "\n", $Value['Text']);
-                $Value['Text'] = addslashes(stripslashes($Value['Text']));
-                $Line = trim(substr($Line, strpos($TempLine, '"') + 1)); // Skip closing quote and semicolon
-              } else
-              {
-                // Nonstring value
-                $Value['Text'] = substr($Line, 0, strpos($Line, ';'));
-              }
-              $Line = substr($Line, strpos($Line, ';') + 1);
-              $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
-
-              $this->InsertItem($Value);
-            };
-            $Count++;
-          }
-          $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
-          $this->UpdateLastVersion();
-        }
-        // else $Output .= ShowMessage('Již importován pro verzi '.$this->Version['Version'], MESSAGE_CRITICAL);
-      } else $Output .= ShowMessage('Není definováno jméno zdrojového souboru', MESSAGE_CRITICAL);
+      {
+        $File = new FileStream();
+
+        $File->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/lua/'.$this->Group['LuaFileName'].'.lua');
+        $this->NewItemCount = 0;
+        $Count = 0;
+        while (!$File->EOF())
+        {
+          $Line = $File->ReadLine();
+          if (strpos($Line, '=') !== false)
+          {
+            $LineParts = explode('=', $Line, 2);
+            $Value['ShortCut'] = trim($LineParts[0]);
+            $Line = trim($LineParts[1]);
+            if ($Line[0] == '"')
+            {
+              // Quoted string value
+              $Line = substr($Line, 1); // Skip start qoute
+              $TempLine = str_replace('\"', '  ', $Line); // Temporary remove slashed quotes
+              $Value['Text'] = substr($Line, 0, strpos($TempLine, '"'));
+              $Value['Text'] = str_replace('\n', "\n", $Value['Text']);
+              $Value['Text'] = addslashes(stripslashes($Value['Text']));
+              $Line = trim(substr($Line, strpos($TempLine, '"') + 1)); // Skip closing quote and semicolon
+            } else
+            {
+              // Nonstring value
+              $Value['Text'] = substr($Line, 0, strpos($Line, ';'));
+            }
+            $Line = substr($Line, strpos($Line, ';') + 1);
+            $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
+
+            $this->InsertItem($Value);
+          };
+          $Count++;
+        }
+        $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
+        $this->UpdateLastVersion();
+      }
+      // else $Output .= ShowMessage('Již importován pro verzi '.$this->Version['Version'], MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage('Není definováno jméno zdrojového souboru', MESSAGE_CRITICAL);
     $Output .= ShowMessage('Dokončeno.');
     return $Output;
@@ -239 +239 @@
   function UpdateTranslated()
   {
-    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 />';
@@ -249 +247 @@
       while ($do)
       {
-      $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, '.
-        '`gs_tran`.`VersionEnd` AS `VersionEnd_tran`, '.
-        '`gs_tran`.`VersionStart` AS `VersionStart_tran`, '.
-        '`gs_orig`.`VersionEnd` AS `VersionEnd_orig`, '.
-        '`gs_orig`.`VersionStart` AS `VersionStart_orig` FROM `'.
+        $DbResult = $this->System->Database->query('SELECT `gs_tran`.`ID`, '.
+          '`gs_tran`.`VersionEnd` AS `VersionEnd_tran`, '.
+          '`gs_tran`.`VersionStart` AS `VersionStart_tran`, '.
+          '`gs_orig`.`VersionEnd` AS `VersionEnd_orig`, '.
+          '`gs_orig`.`VersionStart` AS `VersionStart_orig` FROM `'.
         $Group['TablePrefix'].'` AS `gs_tran` JOIN `'.$Group['TablePrefix'].
-        '` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE '.
-        '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd` OR `gs_tran`.`VersionStart` <> `gs_orig`.`VersionStart`');
+          '` AS `gs_orig` ON `gs_orig`.`ID` = `gs_tran`.`Take` WHERE '.
+          '`gs_tran`.`VersionEnd` <> `gs_orig`.`VersionEnd` OR `gs_tran`.`VersionStart` <> `gs_orig`.`VersionStart`');
         $do = ($DbResult->num_rows > 0);
         while ($DbRow = $DbResult->fetch_assoc())
@@ -293 +291 @@
 
       if ($this->Group['Id'] == 1)
-       while ($part = substr($old, strpos($old, '<'), strpos($old, '>')-strpos($old, '<')))
-        if ($part <> '') {
-          $old = str_replace($part.'>', '', $old);
-        }
+      {
+        while ($part = substr($old, strpos($old, '<'), strpos($old, '>')-strpos($old, '<')))
+        {
+          if ($part <> '') 
+          {
+            $old = str_replace($part.'>', '', $old);
+          }
+        }
+      }
 
       if (($GroupItem['MangosColumn'] <> '') and ($Group['MangosDatabase'] == 'mangos'))
@@ -319 +322 @@
 
       if ($this->Group['Id'] == 1)
-       while ($part = substr($new, strpos($new, '<'), strpos($new, '>')-strpos($new, '<')))
-        if ($part <> '') {
-          $new = str_replace($part.'>', '', $new);
-        }
+      {
+        while ($part = substr($new, strpos($new, '<'), strpos($new, '>')-strpos($new, '<')))
+        {
+          if ($part <> '') 
+          {
+            $new = str_replace($part.'>', '', $new);
+          }
+        }
+      }
 
       if (($old == 'null') or ($old == 'NULL')) $old = '';
@@ -344 +352 @@
   function ImportDBC()
   {
-    global $System, $Config;
-
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
+    global $System;
+
     $Output = 'Načítání textů z DBC souboru...';
     if (($this->Group['DBCFileName'] != '') and ($this->Group['TablePrefix'] != ''))
@@ -381 +388 @@
         $ColumnValue = '';
         foreach ($Columns as $Column)
+        {
           $ColumnValue .= '_'.$DBCFile->GetUint($I, $Column);
+        }
         $ColumnValue = substr($ColumnValue, 1);
         $Value[$this->Group['PrimaryKeyItem']] = $ColumnValue;
@@ -410 +419 @@
   function ImportSQL()
   {
-    global $PatchVersion;
-
-    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
     $Output = '';
     $File = new FileStream();
@@ -418 +424 @@
     $this->NewItemCount = 0;
     $Count = 0;
-    $folow_structure = false;
+    $FollowStructure = false;
     $i = 0;
     while ((!$File->EOF()))
@@ -427 +433 @@
       {
         $Line = '';
-        $folow_structure = true;
+        $FollowStructure = true;
         $i = 0;
       }
-      if ((strpos($Line, ';') !== false) and ($folow_structure == true))
-      {
-        $folow_structure = false;
-        //  echo ('Struktura: <br />');
-        //  print_r($structure);
-        //  echo ('<br /><br />');
-      }
-      if (($folow_structure == true) and ($Line != ''))
+      if ((strpos($Line, ';') !== false) and ($FollowStructure == true))
+      {
+        $FollowStructure = false;
+      }
+      if (($FollowStructure == true) and ($Line != ''))
       {
         $str = substr($Line, 0, strpos($Line, '`'));
@@ -446 +449 @@
       }
 
-      //data
+      // data
       if ((strpos($Line, 'INSERT INTO `'.$this->Group['MangosTable'].'`') !== false) and (isset($structure)))
       {
@@ -503 +506 @@
               $Value[$column] = '';
             }
-            //  echo ($column.'-"'.$Value[$column].'"<br>');
           }
           foreach ($this->Group['Items'] as $GroupItem)
           {
             if ($GroupItem['MangosColumn'] != '')
+            {
               if (isset($Value[$GroupItem['MangosColumn']]))
+              {
                 $Value[$GroupItem['Column']] = $Value[$GroupItem['MangosColumn']];
-              else {
+              }
+              else 
+              {
                 $Value[$GroupItem['Column']] = '';
                 $Value[$GroupItem['MangosColumn']] ='';
               }
+            }
           }
 
@@ -520 +527 @@
           $ColumnValue = '';
           foreach ($Columns as $Column)
+          {
             $ColumnValue .= '_'.$Value[$Column];
+          }
           $ColumnValue = substr($ColumnValue, 1);
           $Value[$this->Group['PrimaryKeyItem']] = $ColumnValue;
@@ -533 +542 @@
   }
 
-  function UpdateLastVersion() {
+  function UpdateLastVersion() 
+  {
     $DbResult = $this->System->Database->query('SELECT * FROM `Group` WHERE `Id`='.$this->Group['Id']);
     $Version = $DbResult->fetch_assoc();

trunk/Modules/Import/generatecodeXML.php

@@ -1 +1 @@
 <?php
+
 $depth = array();
 //$xml_buffer = array();

trunk/includes/Global.php

@@ -818 +818 @@
     return preg_replace($find, $replace, $text);
 }
+
+function NormalizePath(string $Path): string
+{
+  $Segments = explode('/', $Path);
+  $Result = array();
+  for ($I = 0; $I < count($Segments); $I++)
+  {
+    $Segment = $Segments[$I];
+    if (($Segment == '.') || ((strlen($Segment) == 0) && ($I > 0) && ($I < count($Segments) - 1))) 
+    {
+      continue;
+    }
+    if ($Segment == '..') 
+    {
+      array_pop($Result);
+    } else 
+    {
+      array_push($Result, $Segment);
+    }
+  }
+  return implode('/', $Result);
+}