Changeset 816 for trunk/Modules

Timestamp:

Feb 22, 2015, 11:20:50 PM (10 years ago)

Author:

chronos

Message:

• Modified: Tabs converted to spaces.
• Modified: Remove spaces from end of lines.
• Added: Code format script.

Location:

trunk/Modules

Files:

• AoWoW/AoWoW.php (modified) (1 diff)
• ClientVersion/ClientVersion.php (modified) (3 diffs)
• Dictionary/Dictionary.php (modified) (22 diffs)
• Download/Download.php (modified) (7 diffs)
• Error/Error.php (modified) (10 diffs)
• Export/CreateAddon.php (modified) (15 diffs)
• Export/Export.php (modified) (40 diffs)
• Export/ExportOutput.php (modified) (26 diffs)
• Export/Page.php (modified) (4 diffs)
• Export/ProcessAoWoWExport.php (modified) (3 diffs)
• Export/ProcessTask.php (modified) (1 diff)
• Export/Progress.php (modified) (3 diffs)
• Export/cmdmpqexport.php (modified) (13 diffs)
• Forum/Forum.php (modified) (6 diffs)
• FrontPage/FrontPage.php (modified) (2 diffs)
• Import/Import.php (modified) (27 diffs)
• Import/Manage.php (modified) (7 diffs)
• Import/cmd.php (modified) (7 diffs)
• Log/Log.php (modified) (9 diffs)
• News/News.php (modified) (4 diffs)
• News/RSS.php (modified) (1 diff)
• Redirection/Redirection.php (modified) (2 diffs)
• Referrer/Referrer.php (modified) (6 diffs)
• Search/Search.php (modified) (1 diff)
• Server/Server.php (modified) (2 diffs)
• ShoutBox/ShoutBox.php (modified) (4 diffs)
• Team/Team.php (modified) (2 diffs)
• Translation/Comparison.php (modified) (1 diff)
• Translation/Form.php (modified) (5 diffs)
• Translation/LoadNames.php (modified) (3 diffs)
• Translation/Progress.php (modified) (5 diffs)
• Translation/Save.php (modified) (1 diff)
• Translation/Translation.php (modified) (4 diffs)
• Translation/TranslationList.php (modified) (4 diffs)
• User/Options.php (modified) (1 diff)
• User/Profile.php (modified) (4 diffs)
• User/Registration.php (modified) (3 diffs)
• User/User.php (modified) (5 diffs)
• User/UserList.php (modified) (1 diff)
• Wiki/Wiki.php (modified) (4 diffs)

trunk/Modules/AoWoW/AoWoW.php

@@ -16 +16 @@
   function Start()
   {
-        $this->System->RegisterMenuItem(array(
-        'Title' => 'AoWoW',
-        'Hint' => 'Vyhledávací databáze podobná WoWHead s překlady',
-        'Link' => $this->System->Link('/aowow/'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterMenuItem(array(
+      'Title' => 'AoWoW',
+      'Hint' => 'Vyhledávací databáze podobná WoWHead s překlady',
+      'Link' => $this->System->Link('/aowow/'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ));
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))

trunk/Modules/ClientVersion/ClientVersion.php

@@ -16 +16 @@
   function Start()
   {
-        $this->System->RegisterPage('client-version', 'PageClientVersion');
-        $this->System->RegisterMenuItem(array(
-        'Title' => T('Game version'),
-        'Hint' => T('List of the game client versions'),
-        'Link' => $this->System->Link('/client-version/'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterPage('client-version', 'PageClientVersion');
+    $this->System->RegisterMenuItem(array(
+      'Title' => T('Game version'),
+      'Hint' => T('List of the game client versions'),
+      'Link' => $this->System->Link('/client-version/'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 10);
   }
@@ -29 +29 @@
 class PageClientVersion extends Page
 {
-        function Show()
-        {
-                if(array_key_exists('action', $_GET))
-                {
-                        if($_GET['action'] == 'item') $Output = $this->ShowItem();
-                        else $Output = $this->ShowList();
-                } else $Output = $this->ShowList();
-                return($Output);
-        }
+  function Show()
+  {
+    if(array_key_exists('action', $_GET))
+    {
+      if($_GET['action'] == 'item') $Output = $this->ShowItem();
+      else $Output = $this->ShowList();
+    } else $Output = $this->ShowList();
+    return($Output);
+  }
 
-        function ShowItem()
-        {
+  function ShowItem()
+  {
     if(array_key_exists('id', $_GET))
     {
@@ -64 +64 @@
       } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
     } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-                return($Output);
-        }
+    return($Output);
+  }
 
-        function ShowList()
-        {
-                $this->Title = T('Game version');
+  function ShowList()
+  {
+    $this->Title = T('Game version');
     $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ClientVersion`');
     $DbRow = $DbResult->fetch_row();

trunk/Modules/Dictionary/Dictionary.php

@@ -13 +13 @@
     $this->Dependencies = array();
   }
-  
+
   function Start()
   {
-        $this->System->RegisterPage('dictionary', 'PageDictionary');
-        $this->System->RegisterMenuItem(array(
-                'Name' => 'Dictionary',
-        'Title' => T('Dictionary'),
-        'Hint' => T('Dictionary words from WoW'),
-        'Link' => $this->System->Link('/dictionary/'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterPage('dictionary', 'PageDictionary');
+    $this->System->RegisterMenuItem(array(
+      'Name' => 'Dictionary',
+      'Title' => T('Dictionary'),
+      'Hint' => T('Dictionary words from WoW'),
+      'Link' => $this->System->Link('/dictionary/'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 1);
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('dictionary',
-      T('Dictionary'), array('Text', 'Description'), 
+      T('Dictionary'), array('Text', 'Description'),
      '(SELECT * FROM `Dictionary` WHERE `Language` = '.$this->System->Config['OriginalLanguage'].') AS `T`', $this->System->Link('/dictionary/?search='));
   }
@@ -35 +35 @@
 {
 
-function WriteTranslatNames($Text, $mode) 
+function WriteTranslatNames($Text, $mode)
 {
   $Output = '';
@@ -62 +62 @@
 
   $buff = GetTranslatNames($Text,$mode,GetTranslatNamesArray());
-  
+
    // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
   foreach($buff as $Line) {
-      if ($mode == 0) 
-      {
-        if (strpos(strtolower($Text), strtolower($Line[2])) > 0) 
+      if ($mode == 0)
+      {
+        if (strpos(strtolower($Text), strtolower($Line[2])) > 0)
         {
           $Output .= '<tr><td>'.$Line[2].'</td>';
@@ -73 +73 @@
           else $Output .= '<td><a target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">Překládat</a></td></tr>';
         }
-      } else 
+      } else
       {
         $Output .= '<tr><td>'.$Line[2].'</td>';
@@ -101 +101 @@
         '</form>';
   } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-  return($Output); 
+  return($Output);
 }
 
@@ -125 +125 @@
           '`User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.$this->System->Config['OriginalLanguage'].');');
       }
-  
+
       $DbResult = $this->Database->query('SELECT `Id` FROM `Dictionary` WHERE '.
         '`Entry` = '.$Entry.' AND `Language`='.$_POST['Language'].' AND `User`='.$this->System->User->Id);
@@ -136 +136 @@
         $this->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , '.
           '`User`, `Language` ) VALUES ("'.$_POST['Translated'].'", "'.$Entry.'", "'.
-                $_POST['Description'].'", '.$this->System->User->Id.', '.$_POST['Language'].')');
+          $_POST['Description'].'", '.$this->System->User->Id.', '.$_POST['Language'].')');
       $Output = ShowMessage('Záznam byl uložen!');
     } else $Output = ShowMessage(T('You have to fill all column of form.'), MESSAGE_CRITICAL);
   } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-  return($Output); 
+  return($Output);
 }
 
@@ -176 +176 @@
         '</fieldset>'.
         '</form>';
-    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL); 
+    } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
   } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
   return($Output);
@@ -184 +184 @@
 {
   global $TranslationTree;
-  
+
   $Output = '';
   $GroupId = LoadGroupIdParameter();
@@ -190 +190 @@
   else $mode = 0; //0 = exact names, 1=all names, 2=nontranslated
   $Table = $TranslationTree[$GroupId]['TablePrefix'];
-  
+
   if(array_key_exists('ID', $_GET))
   {
@@ -208 +208 @@
       $Output .= $this->WriteTranslatNames($Text, $mode);
     }
-  }  
+  }
   return($Output);
 }
@@ -215 +215 @@
 {
   global $LanguageList;
-  
+
   $Output = '<form action="?" method="get" style="margin: 0px; padding: 0px;">'.
   '<table style="width: 100%; height: 100%;">';
@@ -221 +221 @@
   if(array_key_exists('search', $_GET)) $Search = $_GET['search'];
     else $Search = '';
-       
+
   $Output .= '<tr><td>
     <input type="text" value="'.$Search.'" name="search" size="30" />
     <input type="submit" value="'.T('Search').'" />';
-  if($this->System->User->Licence(LICENCE_USER)) 
-        $Output .= ' <a href="?action=insert">'.T('Add word').'</a>';
-           
-  $Output .= '</td></tr>'. 
+  if($this->System->User->Licence(LICENCE_USER))
+    $Output .= ' <a href="?action=insert">'.T('Add word').'</a>';
+
+  $Output .= '</td></tr>'.
     '<tr><td>'.T('Language').': ';
   $Lang = '<a href="?language=">'.T('All').'</a>';
@@ -236 +236 @@
     if($Language['Enabled'] == 1)
     {
-        $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+      $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
       if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
         else $Output .= $Lang;
@@ -247 +247 @@
     else $LanguageFilter = ' AND (`T1`.`Language` = '.$_SESSION['language'].')';
 
-  if($Search <> '') 
+  if($Search <> '')
   {
     $Condition = ' AND (LOWER(`T1`.`Text`) LIKE LOWER("%'.$Search.'%")) OR '.
       ' (LOWER(`T2`.`Text`) LIKE LOWER("%'.$Search.'%")) OR '.
       '(LOWER(`T1`.`Description`) LIKE LOWER("%'.$Search.'%"))';
-  } else $Condition = ''; 
+  } else $Condition = '';
   $sql = 'SELECT `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId`, '.
       '`Language`.`Name` AS `LangName`, `T1`.`Id` AS `Id`, '.
-      '`T1`.`Entry`, `T2`.`Text` AS `Original`, `T1`.`Text` AS `Translated`, `T1`.`Description` '.    
+      '`T1`.`Entry`, `T2`.`Text` AS `Original`, `T1`.`Text` AS `Translated`, `T1`.`Description` '.
       'FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` '.
       'ON (`T2`.`Entry` = `T1`.`Entry`) AND (`T2`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
@@ -262 +262 @@
       'WHERE 1'.
       $LanguageFilter.$Condition;
-  
+
   $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');
   $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);  
+  $PageList = GetPageList($DbRow[0]);
 
   $Output .= $PageList['Output'];
-  
+
   if(is_numeric($_SESSION['language'])) $LanguageName = $LanguageList[$_SESSION['language']]['Name'];
     else $LanguageName = 'Překlad';
-  $TableColumns = array(      
-    array('Name' => 'Original', 'Title' => T('English')), 
+  $TableColumns = array(
+    array('Name' => 'Original', 'Title' => T('English')),
     array('Name' => 'Translated', 'Title' => $LanguageName),
-  ); 
+  );
   if(!is_numeric($_SESSION['language'])) $TableColumns[] = array('Name' => 'LangName', 'Title' => T('Language'));
   $TableColumns[] = array('Name' => 'Description', 'Title' => T('Description'));
-  $TableColumns[] = array('Name' => 'UserName', 'Title' => T('Translator'));   
+  $TableColumns[] = array('Name' => 'UserName', 'Title' => T('Translator'));
   if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('Action'));
   $Order = GetOrderTableHeader($TableColumns, 'Original');
@@ -284 +284 @@
   $sql_page = $sql.$Order['SQL'].$PageList['SQLLimit'];
   $DbResult = $this->Database->query($sql_page);
-  while($Line = $DbResult->fetch_assoc()) 
+  while($Line = $DbResult->fetch_assoc())
   {
     $Output .= '<tr>'.
@@ -294 +294 @@
     if($this->System->User->Licence(LICENCE_USER))
     {
-      if($Line['UserId'] == $this->System->User->Id) 
+      if($Line['UserId'] == $this->System->User->Id)
         $Output .= '<td><a href="?action=remove&amp;id='.$Line['Id'].'" onclick="return confirmAction(\''.T('Do you really want to delete item?').'\');">'.T('Delete').'</a>'.
         ' <a href="?action=modify&amp;id='.$Line['Id'].'">'.T('Modify').'</a></td>';
@@ -301 +301 @@
     $Output .= '</tr>';
   }
-  $Output .= '</table>'.  
+  $Output .= '</table>'.
     $PageList['Output'].
-    '</td></tr>'. 
+    '</td></tr>'.
     '</table></form>';
   return($Output);
@@ -310 +310 @@
 function Show()
 {
-        global $LanguageList;
-        
-        $this->Title = T('Dictionary');
-        
+  global $LanguageList;
+
+  $this->Title = T('Dictionary');
+
 $LanguageList = GetLanguageList();
 
 if(!isset($_SESSION['language']))
 {
-        if($this->System->User->Licence(LICENCE_USER))
-        {
-                $_SESSION['language'] = $this->System->User->Language;
+  if($this->System->User->Licence(LICENCE_USER))
+  {
+    $_SESSION['language'] = $this->System->User->Language;
   } else $_SESSION['language'] = '';
 }
 if(array_key_exists('language', $_GET)) {
   if($_GET['language'] == '') $_SESSION['language'] = '';
-          else $_SESSION['language'] = $_GET['language'] * 1;
+    else $_SESSION['language'] = $_GET['language'] * 1;
 }
 
@@ -331 +331 @@
 
 $ShowList = true;
-if(array_key_exists('action', $_GET)) 
+if(array_key_exists('action', $_GET))
 {
   if($_GET['action'] == 'group') {
@@ -337 +337 @@
     $ShowList = false;
   }
-  else if($_GET['action'] == 'insert') $Output .= $this->DictionaryInsert(); 
-  else if($_GET['action'] == 'save') $Output .= $this->DictionarySave(); 
+  else if($_GET['action'] == 'insert') $Output .= $this->DictionaryInsert();
+  else if($_GET['action'] == 'save') $Output .= $this->DictionarySave();
   else if($_GET['action'] == 'remove') $Output .= $this->DictionaryRemove();
   else if($_GET['action'] == 'modify') $Output .= $this->DictionaryModify();
-  else $Output .= ShowMessage(T('Unknown action'), MESSAGE_CRITICAL);  
-} 
+  else $Output .= ShowMessage(T('Unknown action'), MESSAGE_CRITICAL);
+}
 if($ShowList == true) $Output .= $this->DictionaryShow();
     return($Output);

trunk/Modules/Download/Download.php

@@ -3 +3 @@
 class ModuleDownload extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'Download';
-                $this->Version = '1.0';
-                $this->Creator = 'Maron';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'Show list of selected export and link to static files';
-                $this->Dependencies = array();
-        }
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Download';
+    $this->Version = '1.0';
+    $this->Creator = 'Maron';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Show list of selected export and link to static files';
+    $this->Dependencies = array();
+  }
 
-        function Start()
-        {
-                $this->System->RegisterPage('download', 'PageDownload');
-                $this->System->RegisterMenuItem(array(
+  function Start()
+  {
+    $this->System->RegisterPage('download', 'PageDownload');
+    $this->System->RegisterMenuItem(array(
       'Title' => T('Download'),
       'Hint' => T('List of czech to download'),
@@ -24 +24 @@
       'Icon' => '',
     ), 1);
-        }
+  }
 }
 
 class PageDownload extends Page
 {
-        function ShowFiles()
-        {
+  function ShowFiles()
+  {
     $fileslink = $this->System->Link('/files');
 $Output = '<h3>'.T('Accessories for client').'</h3>'.
@@ -75 +75 @@
   '<a href="'.$fileslink.'/ClientDBExtractor.exe">ClientDBExtractor.exe</a> - '.T('tool for exporting dbc files from game client').'<br />';
   return($Output);
-        }
+  }
 
-        function ShowDownload()
-        {
+  function ShowDownload()
+  {
     $Output = '<h3>'.T('Download czech').'</h3><br />';
 
@@ -101 +101 @@
     $Output .= '<table class="BaseTable">'.
       $Order['Output'];
-        $DbRows = $this->Database->query('SELECT `ClientVersion`.`Version` AS `Version`, '.
+    $DbRows = $this->Database->query('SELECT `ClientVersion`.`Version` AS `Version`, '.
       '`Export`.`Id`, `Export`.`ClientVersion`, `Export`.`OutputType`, `Export`.`Title`, '.
       '`Export`.`Description` FROM `Export` '.
@@ -110 +110 @@
         $ExportId = $DbExport['Id'];
 
-                          if ($DbExport['OutputType'] == 10)
-                    $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'Instalace_CzechWoW_'.$DbExport['Version'].'.exe';
-                          if ($DbExport['OutputType'] == 7)
-                    $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'CzWoW_Addon-'.$DbExport['Version'].'.zip';
+        if ($DbExport['OutputType'] == 10)
+          $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'Instalace_CzechWoW_'.$DbExport['Version'].'.exe';
+        if ($DbExport['OutputType'] == 7)
+          $filename = $this->System->Config['Web']['TempFolder'].'Export/'.$ExportId.'/'.'CzWoW_Addon-'.$DbExport['Version'].'.zip';
 
-                          if ($DbExport['OutputType'] == 10)
+        if ($DbExport['OutputType'] == 10)
           $Output .= '<tr><td><a href="'.$this->System->Link('/'.$filename).
             '">CzechWoW_'.$DbExport['Version'].'.exe</a><br /> <a href="'.
             $this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">Export '.$ExportId.'</a></td>';
         else
-                          if ($DbExport['OutputType'] == 7)
+        if ($DbExport['OutputType'] == 7)
           $Output .= '<tr><td><a href="'.$this->System->Link('/'.$filename).
             '">CzWoW_Addon-'.$DbExport['Version'].'.zip</a><br /> <a href="'.
@@ -131 +131 @@
         $Output .= '<td>'.$DbExport['Title'].'</td>'; //.'<td>'.$DbExport['ClientVersion'].'</td>';
 
-                          if ((($DbExport['OutputType'] == 10) or ($DbExport['OutputType'] == 7)) and (file_exists($filename)))
+        if ((($DbExport['OutputType'] == 10) or ($DbExport['OutputType'] == 7)) and (file_exists($filename)))
           $Output .= '<td>'.date('d.m.y H:i',filemtime($filename)).'</td>';
         else
           $Output .= '<td>&nbsp;</td>';
 
-                                        $Output .=
-                                        '<td>'.str_replace("\n", '<br />',$DbExport['Description']).'</td>'.
+          $Output .=
+          '<td>'.str_replace("\n", '<br />',$DbExport['Description']).'</td>'.
           '</tr>';
     }
@@ -146 +146 @@
   }
 
-        function Show()
-        {
-                $this->Title = T('Download');
-          $Output = '';
+  function Show()
+  {
+    $this->Title = T('Download');
+    $Output = '';
     if (isset($_GET['Files'])) $Output .= $this->ShowFiles();
     else $Output .= $this->ShowDownload();

trunk/Modules/Error/Error.php

@@ -7 +7 @@
   var $UserErrors;
   var $OnError;
-    
+
   function __construct($System)
   {
@@ -23 +23 @@
     $this->OnError = array();
   }
-  
+
   function Install()
   {
@@ -32 +32 @@
   {
     parent::UnInstall();
-  }  
-  
+  }
+
   function Start()
   {
@@ -40 +40 @@
     set_exception_handler(array($this, 'ExceptionHandler'));
   }
-  
+
   function Stop()
   {
-        restore_error_handler();
-        restore_exception_handler();
-        parent::Stop();
+    restore_error_handler();
+    restore_exception_handler();
+    parent::Stop();
   }
-  
+
   function ErrorHandler($Number, $Message, $FileName, $LineNumber, $Variables)
   {
@@ -64 +64 @@
       1024 => 'User Notice'
     );
-  
+
     if(($this->UserErrors & $Number))
     {
@@ -73 +73 @@
       $Backtrace[0]['line'] = $LineNumber;
       $this->Report($Backtrace);
-      //if((E_ERROR | E_PARSE) & $Number) 
-      die(); 
+      //if((E_ERROR | E_PARSE) & $Number)
+      die();
     }
   }
-  
-  function ExceptionHandler(Exception $Exception) 
+
+  function ExceptionHandler(Exception $Exception)
   {
-    $Backtrace = $Exception->getTrace();    
+    $Backtrace = $Exception->getTrace();
     array_unshift($Backtrace, array(
       'function' => $Exception->getMessage(),
@@ -89 +89 @@
     die();
   }
-  
+
   function Report($Backtrace)
   {
-    $Date = date('Y-m-d H:i:s');                
+    $Date = date('Y-m-d H:i:s');
     $Error = '# '.$Date."\n";
     foreach($Backtrace as $Item)
@@ -98 +98 @@
       if(!array_key_exists('line', $Item)) $Item['line'] = '';
       if(!array_key_exists('file', $Item)) $Item['file'] = '';
-    
+
       $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
       $Arguments = '';
@@ -112 +112 @@
     }
     $Error .= "\n";
-        
+
     // Show error message
     $Output = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"><html><head>'."\n".
       '<meta http-equiv="Content-Language" content="cs">'."\n".
       '<meta http-equiv="Content-Type" content="text/html; charset='.$this->Encoding.'"></head><body>'."\n".
-      T('An internal error occurred! <br /> Administrator has been made ​​aware of it and the error soon will be removed.').'<br/><br/>';       
+      T('An internal error occurred! <br /> Administrator has been made ​​aware of it and the error soon will be removed.').'<br/><br/>';
     if($this->ShowError == true)
       $Output .= '<pre>'.$Error.'</pre><br/>';
@@ -125 +125 @@
       $OnError[0]->$OnError[1]($Error);
   }
-}         
+}

trunk/Modules/Export/CreateAddon.php

@@ -5 +5 @@
 class ExportAddon extends Export
 {
-  
+
   // Replace special codes by lua functions
   function ReplaceVarInText($string, $strlower = 'strlower')
   {
-    
+
     $string = str_replace('$N', '"..'.$strlower.'(UnitName("player")).."', $string);
     $string = str_replace('$n', '"..'.$strlower.'(UnitName("player")).."', $string);
@@ -17 +17 @@
     $string = str_replace('$r', '"..'.$strlower.'(UnitRace("player")).."', $string);
     $Gender = '$G';
-    while(strpos($string, $Gender) !== false) 
+    while(strpos($string, $Gender) !== false)
     {
       $Before = substr($string, 0, strpos($string, $Gender));
@@ -28 +28 @@
       $Woman = str_replace(' ', '', $Woman);
       $string = $Before.'"..gsub(gsub(UnitSex("player"), "^2$", "'.$Man.'"), "^3$", "'.$Woman.'").."'.$After;
-    } 
+    }
     $Gender = '$g';
-    while(strpos($string, $Gender) !== false) 
+    while(strpos($string, $Gender) !== false)
     {
       $Before = substr($string, 0, strpos($string, $Gender));
@@ -41 +41 @@
       $Woman = str_replace(' ', '', $Woman);
       $string = $Before.'"..gsub(gsub(UnitSex("player"), "^2$", "'.$Man.'"),"^3$", "'.$Woman.'").."'.$After;
-    } 
+    }
 
     $string = str_replace('$', '', $string);
     $string = str_replace("\r", '', $string);
     $string = str_replace("\n", '\r\n', $string);
-    return($string);    
+    return($string);
   }
 
@@ -53 +53 @@
     //  $string = mysql_escape_string($string);
     $string = strtolower($string);
-  
+
     $string = str_replace('"', '\"', $string);
-    $string = str_replace('$b$b', ' ', $string);  
-    $string = str_replace('$b $b', ' ', $string);   
-    $string = str_replace('$b', ' ', $string);  
-    $string = $this->ReplaceVarInText($string);  
+    $string = str_replace('$b$b', ' ', $string);
+    $string = str_replace('$b $b', ' ', $string);
+    $string = str_replace('$b', ' ', $string);
+    $string = $this->ReplaceVarInText($string);
     $string = str_replace("\r", ' ', $string);
     $string = str_replace("\n", ' ', $string);
@@ -64 +64 @@
     $string = str_replace('\\n', ' ', $string);
     $string = str_replace(' ', '', $string);
-//    while(strpos($string, '  ')) 
+//    while(strpos($string, '  '))
 //      $string = str_replace('  ', ' ', $string);
     return($string);
@@ -73 +73 @@
     $string = $this->Database->real_escape_string($string);
     $string = str_replace('$B', '\r\n', $string);
-    $string = str_replace('$b', '\r\n', $string); 
+    $string = str_replace('$b', '\r\n', $string);
     $string = $this->ReplaceVarInText($string,'');
     return($string);
@@ -104 +104 @@
   {
     global $TranslationTree, $CreatedFileList;
-   
+
     $Output = '';
     $this->LoadFilters();
-    
+
     $CreatedFileList = array();
     $CreatedFileListCount = array();
-    
+
     if(!file_exists($this->TempDir.'CzWoW/')) mkdir($this->TempDir.'CzWoW/', 0777, true);
-  
+
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`TablePrefix` != ""');
     while($Group = $DbResult->fetch_assoc())
     {
     //získání čísla verze pro export
-      $ID = $this->Database->query('SELECT LastVersion FROM `Group` WHERE Id = '.$Group['Id']); 
+      $ID = $this->Database->query('SELECT LastVersion FROM `Group` WHERE Id = '.$Group['Id']);
       $LastVersion = $ID->fetch_assoc();
-      
+
       if ($LastVersion['LastVersion'] < $this->ClientVersion['BuildNumber'])
         $ExportVersion = $LastVersion['LastVersion'];
@@ -125 +125 @@
 
       foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
-      if($Column['AddonFileName'] != '')  
+      if($Column['AddonFileName'] != '')
       {
         $this->AddProgress(1);
-        if(!isset($CreatedFileListCount[$Column['AddonFileName']])) 
+        if(!isset($CreatedFileListCount[$Column['AddonFileName']]))
         $CreatedFileListCount[$Column['AddonFileName']] = 0;
         $CreatedFileListCount[$Column['AddonFileName']]++;
         $FileIndex = $CreatedFileListCount[$Column['AddonFileName']];
-    
+
         $CreatedFileList[] = $Column['AddonFileName'].'_'.$FileIndex;
-        $FileName = $this->TempDir.'CzWoW/'.$Column['AddonFileName'].'_'.$FileIndex.'.lua';        
+        $FileName = $this->TempDir.'CzWoW/'.$Column['AddonFileName'].'_'.$FileIndex.'.lua';
         $Output .= $Column['AddonFileName'].': ';
         $i = 0;
@@ -140 +140 @@
         $Buffer = 'CZWOW_'.$Column['AddonFileName'].'_count='.$FileIndex.';CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
         $TableTexts = array();
-    
+
         //old version
         //get version before
@@ -146 +146 @@
         if ($ExportVersion == '') $BuildNumber = $this->ClientVersion['BuildNumber'];
         $ID = $this->Database->query('SELECT `BuildNumber` FROM `ClientVersion` WHERE '.
-        ' `Imported` = 1 AND `BuildNumber` < '.$BuildNumber.' ORDER BY  `BuildNumber` DESC LIMIT 1');  
-        if($ID->num_rows > 0) {        
+        ' `Imported` = 1 AND `BuildNumber` < '.$BuildNumber.' ORDER BY  `BuildNumber` DESC LIMIT 1');
+        if($ID->num_rows > 0) {
           $ExportVersionOld = $ID->fetch_assoc();
           $ExportVersionOld = $ExportVersionOld['BuildNumber'];
-        
-          $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersionOld));        
-          while($Line = $DbResult2->fetch_assoc()) 
+
+          $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersionOld));
+          while($Line = $DbResult2->fetch_assoc())
           {
-            $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));  
+            $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
             $cz = $this->ReplaceCzText($Line[$Column['Column']]);
-            if(($en <> '') and ($cz <> '') and ($this->NotCancel($en))) 
+            if(($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
             {
-               $TableTexts[$en] = $cz; 
+               $TableTexts[$en] = $cz;
             }
           }
         }
                 //last version
-       
-        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));        
-        while($Line = $DbResult2->fetch_assoc()) 
+
+        $DbResult2 = $this->Database->query($this->BuildQuery($Group,$ExportVersion));
+        while($Line = $DbResult2->fetch_assoc())
         {
-          $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));  
+          $en = trim($this->ReplaceEnText($Line['En'.$Column['Column']]));
           $cz = $this->ReplaceCzText($Line[$Column['Column']]);
-          if(($en <> '') and ($cz <> '') and ($this->NotCancel($en))) 
+          if(($en <> '') and ($cz <> '') and ($this->NotCancel($en)))
           {
-             $TableTexts[$en] = $cz; 
+             $TableTexts[$en] = $cz;
           }
         }
-        
+
         foreach($TableTexts as $key => $value) {
             $Buffer .= "\n".'["'.$key.'"]="'.$value.'",';
             $i++;
         }
-        
-    
+
+
         $Buffer = $Buffer."\n};if not CZWOW_".$Column['AddonFileName']." then CZWOW_".$Column['AddonFileName']."=0; end; CZWOW_".$Column['AddonFileName']."=CZWOW_".$Column['AddonFileName']."+".$i.";\n";
 
@@ -193 +193 @@
     $Buffer = '';
     foreach($CreatedFileList as $CreatedFile)
-      $Buffer .= 'CZWOW_'.str_replace('_','_count=',$CreatedFile).';'."\n"; 
+      $Buffer .= 'CZWOW_'.str_replace('_','_count=',$CreatedFile).';'."\n";
     foreach($TranslationTree as $Group)
       foreach($TranslationTree[$Group['Id']]['Items'] as $Column)
-      if (($Column['AddonFileName'] != '') and (!in_array($Column['AddonFileName'].'_1', $CreatedFileList))) 
+      if (($Column['AddonFileName'] != '') and (!in_array($Column['AddonFileName'].'_1', $CreatedFileList)))
       {
-        $Buffer .= 'CZWOW_'.$Column['AddonFileName'].'_count=0;'."\n"; 
-    }
-    
+        $Buffer .= 'CZWOW_'.$Column['AddonFileName'].'_count=0;'."\n";
+    }
+
     file_put_contents($this->TempDir.'CzWoW/'.$CountFiles, $Buffer);
-  
-  
+
+
     // Generate file Translates.xml
     $Buffer = '<Ui xmlns="http://www.blizzard.com/wow/ui/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.blizzard.com/wow/ui/.\FrameXML\UI.xsd">'."\n";
@@ -218 +218 @@
   {
     global $TranslationTree;
-  
+
     $this->LoadFilters();
-  
+
     $Buffer = "local f=function(name, en, cz) CzWoW_interface[name]=cz;CzWoW_interface_entoname[en]=name; end; CzWoW_interface={};CzWoW_interface_entoname={ };\n";
     $Group = $TranslationTree[14]; // client table
     $Column['Column'] = 'Text';
-    
+
     $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();
@@ -231 +231 @@
     else
       $CanGenerated = '';
-    
+
     $DbResult = $this->Database->query($this->BuildQuery($Group,$CanGenerated));
-    while($Line = $DbResult->fetch_array()) 
+    while($Line = $DbResult->fetch_array())
     {
       $Original = $this->my_trim($Line['En'.$Column['Column']]);
       $Translated = $this->my_trim($Line[$Column['Column']]);
-      if($this->ClientVersion['Version'] == '2.4.3') 
+      if($this->ClientVersion['Version'] == '2.4.3')
       {
         $Original = str_replace("|Hchannel:%d|h[%s]|h", '[%s]', $Original);
@@ -265 +265 @@
     $Buffer = '
  Čeština pro klienty:
-  Vytvořeno v projektu http://wowpreklad.zdechov.net/ 
+  Vytvořeno v projektu http://wowpreklad.zdechov.net/
   Obsahuje Fonty pro správné zobrazování českých znaků, WoW addon překládající
 texty
-  
+
  Instalace:
   Soubory rozbalte/zkopírujte do kořenové složky s hrou. Obvikle bývá
 "C:/Program Files/World of Warcraft/".
-  
+
  Verze:
-  Verze Addonu: '.$Line['Version'].' 
+  Verze Addonu: '.$Line['Version'].'
   Tato verze je pro verzi hry '.$this->ClientVersion['Version'].'
-  
+
  Změny ve verzích:
-  
+
     ';
     $DbResult = $System->Database->query('SELECT * FROM `CzWoWPackageVersion` ORDER BY `Date` DESC');
-    while($Line = $DbResult->fetch_assoc()) 
+    while($Line = $DbResult->fetch_assoc())
     {
       $Buffer .='
-  Verze: '.$Line['Version'].' 
+  Verze: '.$Line['Version'].'
   =============
   '.$Line['text'].'
-  
+
   ';
     }

trunk/Modules/Export/Export.php

@@ -13 +13 @@
   var $TempDir;
   var $SourceDir;
-  
+
   function Init()
   {
@@ -23 +23 @@
     if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
   }
-  
+
   function SaveAllUsers() {
-                $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
-                $Export = $DbResult->fetch_assoc();
-                if ($Export['AllUsers']) {
-                        $DbResult2 = $this->System->Database->query('SELECT ID FROM `User` WHERE `ID` NOT IN(SELECT `User` FROM `ExportUser` WHERE `Export`='.$this->Id.')');
-                        while($UserLine = $DbResult2->fetch_assoc())
-                        {
-                                                $Condition = ' WHERE `Export`='.$this->Id.' AND `User`='.$UserLine['ID'];
-                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition); //,MAX(`Sequence`) as MaxSequence
-                                                if($DbResult->num_rows > 0)
-                                                {
-                                                //      $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
-                                                } else
-                                                {
+    $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
+    $Export = $DbResult->fetch_assoc();
+    if ($Export['AllUsers']) {
+      $DbResult2 = $this->System->Database->query('SELECT ID FROM `User` WHERE `ID` NOT IN(SELECT `User` FROM `ExportUser` WHERE `Export`='.$this->Id.')');
+      while($UserLine = $DbResult2->fetch_assoc())
+      {
+            $Condition = ' WHERE `Export`='.$this->Id.' AND `User`='.$UserLine['ID'];
+            $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition); //,MAX(`Sequence`) as MaxSequence
+            if($DbResult->num_rows > 0)
+            {
+            //  $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
+            } else
+            {
               $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$this->Id.', '.$UserLine['ID'].', 0)');
-                                                }
-                        }
-                        
+            }
+      }
+
       $this->System->Database->query('SET @I = 0');
-                        $this->System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$this->Id.' ORDER BY `Sequence`;');
-                }
-  }
-  
+      $this->System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$this->Id.' ORDER BY `Sequence`;');
+    }
+  }
+
   function LoadFilters()
-  {  
+  {
     $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
     if($DbResult->num_rows == 0) throw new Exception('Export '.$this->Id.' neexistuje');
-    $this->Export = $DbResult->fetch_assoc();   
+    $this->Export = $DbResult->fetch_assoc();
 
     // Filter selected users
     $this->UserNames = '';
     $DbResult = $this->Database->query('SELECT `ExportUser`.*, `User`.`Name`, `User`.`ID` FROM `ExportUser` '.
-        'LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` '.
-        'WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
+      'LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` '.
+      'WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
     while($UserLine = $DbResult->fetch_assoc())
     {
       $this->UserNames .= ', '.$UserLine['Name'];
     }
-    $this->UserNames = substr($this->UserNames, 2);      
-   
+    $this->UserNames = substr($this->UserNames, 2);
+
     if($this->Export['ClientVersion'] != '')
     {
       $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
       $this->ClientVersion = $DbResult->fetch_assoc();
-    } else $this->ClientVersion = '';    
-  }
-  
+    } else $this->ClientVersion = '';
+  }
+
   function BuildQuery($Group, $Version = '')
   {
     global $TranslationTree;
     $this->SaveAllUsers();
-    
-    if ($Version <> '') 
+
+    if ($Version <> '')
       $ExportVersion = $Version;
     else
       $ExportVersion = $this->ClientVersion['BuildNumber'];
 
-          $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
-                while($GroupItem = $DbResultItem->fetch_assoc())
-                {
-                  $GroupItems[$GroupItem['GroupItem']] = 1;
+    $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
+    while($GroupItem = $DbResultItem->fetch_assoc())
+    {
+      $GroupItems[$GroupItem['GroupItem']] = 1;
     }
     // Build selected columns
@@ -93 +93 @@
   //  $Columns = substr($Columns, 0, -2);
 
-    
+
     $Query = 'SELECT * FROM (SELECT '.$Columns.' T.`ID`,T.`Language`,T.`User`,T.`Entry`,T.`VersionEnd`,T.`VersionStart`, `User`.`Name` AS `UserName` FROM `'.$Group['TablePrefix'].'` AS `T`'.
     ' JOIN `ExportUser` ON (`ExportUser`.`User`=`T`.`User`) AND (`ExportUser`.`Export`='.$this->Id.') '.
@@ -105 +105 @@
     foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
       $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
-      if (isset($GroupItems[$Column['Id']])) 
+      if (isset($GroupItems[$Column['Id']]))
         $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
     }
     $OriginalColumns = substr($OriginalColumns, 0, -2);
-    
+
     // Expand query for loading english texts
     $Query = 'SELECT `T4`.*, '.$OriginalColumns.' FROM ('.$Query.') AS `T4` '.
     ' LEFT JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T3`.`Entry` = `T4`.`Entry`) '.
     'AND (`T3`.`Language` = '.$this->System->Config['OriginalLanguage'].') AND '.
-    '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';  
+    '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';
 
     return($Query);
   }
-  
+
   function NeedGeneration()
   {
@@ -130 +130 @@
     else return(true);
   // echo $file;
-    
+
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
-        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    $result = false;         
+      'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+    $result = false;
     while($Group = $DbResult->fetch_assoc())
     {
@@ -146 +146 @@
         if ($DbResult2->num_rows > 0) {
           $result = true;
-        }  
-    }  
+        }
+    }
     return($result);
   }
-  
+
   function ExportToMangosSQL()
   {
     global $TranslationTree;
-  
+
     $this->LoadFilters();
-    
-    $Buffer = 
-      "-- Generováno projektem wowpreklad.zdechov.net\n". 
+
+    $Buffer =
+      "-- Generováno projektem wowpreklad.zdechov.net\n".
       "-- ===========================================\n".
       "--\n".
@@ -168 +168 @@
       "-- Vzato od uživatelů: ".$this->UserNames."\n".
       "-- Generované tabulky: ";
-    
+
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
-        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+      'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
       $Buffer .= $Group['TablePrefix'].', ';
     }
-    $Buffer .= "\n\n";  
+    $Buffer .= "\n\n";
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
-        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+      'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
@@ -186 +186 @@
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
         if($DbResult2->num_rows > 0)
-        while($Line = $DbResult2->fetch_array()) 
+        while($Line = $DbResult2->fetch_array())
         {
           $Values = '';
@@ -199 +199 @@
           // Get multicolumn index
           $ColumnItems = explode(',', $Group['MangosTableIndex']);
-          if(count($ColumnItems) > 1) 
+          if(count($ColumnItems) > 1)
           {
             $Where = 'CONCAT(';
@@ -206 +206 @@
             $Where = substr($Where, 0, -7).')';
           } else $Where = '`'.$Group['MangosTableIndex'].'`';
-          $Where .= ' = "'.$Line[$Group['PrimaryKeyItem']].'";'; 
-          
+          $Where .= ' = "'.$Line[$Group['PrimaryKeyItem']].'";';
+
           $Line = 'UPDATE `'.$Group['MangosTable'].'` SET '.$Values.' WHERE '.$Where;
           $Line = str_replace("\n", '\n', $Line);
           $Line = str_replace("\r", '', $Line);
           $Buffer .= $Line."\n";
-        }     
+        }
       }
     }
@@ -218 +218 @@
     return($Buffer);
   }
-  
-  function ExportToAoWoWSQL() 
+
+  function ExportToAoWoWSQL()
   {
     global $TranslationTree, $AoWoWconf;
-  
+
     //require_once('../aowow/configs/config.php');
-  
+
     $Buffer = $this->ExportToMangosSQL();
-  
+
     /*
     // Data to aowow
     $Database2 = new mysqli($this->Config['Database']['Host'], $this->Config['Database']['User'], $this->Config['Database']['Password'], $this->Config['Database']['Database']);
     $Database2->query('SET NAMES '.$this->Config['Database']['Charset']);
-    $Database2->select_db($AoWoWconf['mangos']['db']);    
+    $Database2->select_db($AoWoWconf['mangos']['db']);
     $AoWoWTables = array(
-      'aowow_resistances' => 'Id', 
-      'aowow_spelldispeltype' => 'Id', 
+      'aowow_resistances' => 'Id',
+      'aowow_spelldispeltype' => 'Id',
       'aowow_skill' => 'skillID',
     );
-    foreach($AoWoWTables as $AoWoWTable => $IndexColum) 
+    foreach($AoWoWTables as $AoWoWTable => $IndexColum)
     {
       $Buffer .= '--'.$AoWoWTable.', ';
-      $Buffer .= "\n\n";  
+      $Buffer .= "\n\n";
       $Query = 'SELECT `name`,`'.$IndexColum.'` FROM `'.$AoWoWTable.'`';
       $DbResult = $Database2->query($Query);
-      while($Line = $DbResult->fetch_assoc()) 
+      while($Line = $DbResult->fetch_assoc())
       {
         $Ori_text = $Line['name'];
@@ -253 +253 @@
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
-        if($Tran['Tran'] == '') 
+        if($Tran['Tran'] == '')
         {
           $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
@@ -263 +263 @@
           $Tran = $DbResult2->fetch_assoc();
         }
-        
+
         if($Tran['Tran'] <> '')
           $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['Tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
-      $Buffer .= "\n\n";  
+      $Buffer .= "\n\n";
     }
     */
     if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
     return($Buffer);
-  }  
-  
-  function HaveVarible($String1, $String2, $StartChar = '$') 
+  }
+
+  function HaveVarible($String1, $String2, $StartChar = '$')
   {
           //Export only if translate have same varible %
-    
+
     if (strpos($String1,$StartChar) !== false) {
-    
+
       while ( strpos($String1,$StartChar) !== false) {
           $pos = strpos($String1,$StartChar);
@@ -291 +291 @@
        //   echo $pos.'-'.$varible.'-'.$String1.'-' .$String2.'
         //  ';
-     
+
           if (false === strpos($String2,$varible)) {
-              //  echo $varible; 
+              //  echo $varible;
             return(false);
           }
@@ -299 +299 @@
     }
     return (true);
-  }  
+  }
 
   function AddProgress($add = 1) {
@@ -312 +312 @@
   {
     global $TranslationTree;
-  
+
     $this->LoadFilters();
-        
+
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
-        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` '.
-        'WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
+      'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` '.
+      'WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
     $Output = 'Počet generovaných skupin: '.$DbResult->num_rows."\n";
     while($Group = $DbResult->fetch_assoc())
@@ -323 +323 @@
       $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
-      if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) 
+      if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
       {
         // Load string column index list
         $DbResult2 = $this->Database->query('SELECT * FROM `GroupItem` '.
-                'JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->ClientVersion['Id'].'  WHERE `GroupItem`.`Group` = '.$Group['Id']);      
+          'JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->ClientVersion['Id'].'  WHERE `GroupItem`.`Group` = '.$Group['Id']);
         $ColumnIndexes = array();
         $ColumnFormat = array();
@@ -347 +347 @@
               $CanExport = false;
               $Output .= ', NE='.$DbRow['ID'];
-            }  
+            }
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
               $CanExport = false;
               $Output .= ', NE='.$DbRow['ID'];
-            }  
+            }
           }
 
           if ($CanExport)
             $LookupTable[$DbRow[$Group['PrimaryKeyItem']]] = $DbRow;
-          
+
         }
-      
+
         // Open original DBC file
         $SourceDBCFile = new DBCFile();
         $SourceDBCFile->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
-        
+
         // Create new DBC file
         if(!file_exists($this->TempDir.'dbc/')) mkdir ($this->TempDir.'dbc/', 0777, true);
@@ -375 +375 @@
         $Output .= "\n\r";
         $RowCount = $SourceDBCFile->GetRecordCount();
-        $FieldCount = $SourceDBCFile->GetFieldCount();        
+        $FieldCount = $SourceDBCFile->GetFieldCount();
         for($Row = 0; $Row < $RowCount; $Row++)
         {
           $Line = $SourceDBCFile->GetLine($Row);
-                    
+
           // Get multicolumn index value
           $PrimaryKeyItem = '';
           $ColumnItems = explode(',', $Group['DBCIndex']);
-          if(count($ColumnItems) > 1) 
+          if(count($ColumnItems) > 1)
           {
             foreach($ColumnItems as $ColumnItem)
@@ -391 +391 @@
 
           if(array_key_exists($PrimaryKeyItem, $LookupTable))
-          {            
+          {
             // Replace text columns
-            $LookupTableItem = $LookupTable[$PrimaryKeyItem];          
+            $LookupTableItem = $LookupTable[$PrimaryKeyItem];
             foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
-            {  
+            {
               if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
                 $Line[$ColumnIndexes[$GroupItem['Id']]] = $LookupTableItem[$GroupItem['Column']];
@@ -401 +401 @@
           }
           $NewDBCFile->SetLine($Row, $Line);
-          
+
           // Show completion progress
           $Progress = round($Row / $RowCount * 100);
@@ -412 +412 @@
             $OldProgress = $Progress;
           }
-        }   
-        $NewDBCFile->Commit();              
+        }
+        $NewDBCFile->Commit();
       } else $Output .= ShowMessage('Zdrojový soubor '.$this->SourceDirRelative.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n", MESSAGE_CRITICAL);
     }
@@ -423 +423 @@
   {
     global $TranslationTree;
-  
+
     $this->LoadFilters();
 
@@ -440 +440 @@
       $File2 = new FileStream();
       $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
-      
+
       $LookupTable = array();
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
@@ -454 +454 @@
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'%')) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'%')) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'\\')) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'\\')) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
@@ -478 +478 @@
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'|')) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
@@ -486 +486 @@
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
               $CanExport = false;
-            }  
+            }
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],chr(10))) {
               if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
@@ -492 +492 @@
             }
           }
-            
+
         if ($CanExport)
             $LookupTable[$DbRow['ShortCut']] = $DbRow;
       }
-        
+
       while(!$File->EOF())
       {
@@ -505 +505 @@
           $Value['ShortCut'] = trim($LineParts[0]);
           $Line = trim($LineParts[1]);
-          
+
           if($Line[0] == '"')
           {
@@ -519 +519 @@
 //            $Value['Text'] = addslashes(stripslashes($Value['Text']));
             $Line = trim(substr($Line, strpos($TempLine, '"') + 1)); // Skip closing quote and semicolon                                                                  {
-          } else 
+          } else
           {
             // Nonstring value
@@ -552 +552 @@
     return($Output);
   }
-  
+
   function GetReadme() {
     $_GET['ExportId'] = $this->Id;
     $PageExport = new PageExport($this->System);
-    $this->LoadFilters();  
+    $this->LoadFilters();
     $Output = '';
     //generation readme
@@ -572 +572 @@
   '<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />'.
   '<title>Čeština pro WoW</title>'.
-'</head><body>'. 
+'</head><body>'.
 '<h1>České WoW - čestina pro klienta hry World of Warcraft</h1>'.
- 
+
 '<table cellspacing="10"><tr><td valign="top">'.
- 
+
 '<p>Texty přebírány z projektu <a href="http://wowpreklad.zdechov.net/">wowpreklad.zdechov.net</a><br>'.
 '<a href="http://wowpreklad.zdechov.net/export/?Action=View&ExportId='.$this->Id.'&Tab=0">Export '.$this->Id.'</a></p><br>'.
- 
- 
+
+
 '<p><strong>Vlastnosti</strong>'.
 '<ul>'.
@@ -591 +591 @@
 '</p>'.
 '<br>'.
- 
+
 '<h2>Nejčastější otázky</h2>'.
-'<p><strong>Jak mám vyhledávat věci v aukci nebo výpravy na internetu s nainstalovanou češtinou?</strong><br>  
-Pokud používáte addon, který mění názvy předmětů jenom zdánlivě pro vás, potřebujete pro vyhledávání v aukci zjistit původní anglický název. Tento název zjistíte jednoduše držením klávesy shift a kliknutím na předmět při otevřené aukci, nebo chatu. Vytvořený odkaz v chatu, nebo text v aukci je v původním znění. Stejně zjistíte i název výpravy kliknutím se shift na výpravu v "quest logu". 
+'<p><strong>Jak mám vyhledávat věci v aukci nebo výpravy na internetu s nainstalovanou češtinou?</strong><br>
+Pokud používáte addon, který mění názvy předmětů jenom zdánlivě pro vás, potřebujete pro vyhledávání v aukci zjistit původní anglický název. Tento název zjistíte jednoduše držením klávesy shift a kliknutím na předmět při otevřené aukci, nebo chatu. Vytvořený odkaz v chatu, nebo text v aukci je v původním znění. Stejně zjistíte i název výpravy kliknutím se shift na výpravu v "quest logu".
 Pokud jste na serveru s českou lokalizaci (tedy nepoužíváte addon), musíte využít český název pro vyhledávání. Server by měl mít spuštěnou vlastní obdobu databáze wowhead.</p>'.
 
-'<p><strong>Po nainstalování češtiny a spouštění přes soubor WoWlua.exe mi klesl výrazně výkon</strong><br> 
-Problém může být spojen s použitím integrované grafiky místo herní.</p>'. 
-
-'<p><strong>Při spouštění hry přes soubor WoWLua.exe se mi neukládá žádné nastavení addonů a podobně</strong><br> 
-Problém může být způsoben špatně nastavenými právy u souboru WoWLua.exe. Můžete přenastavit práva, nebo spouštět jako správce.</p>'. 
-
-'<p><strong>Po spuštění souboru WoWLua.exe mi píše chybu:</strong><br> 
-Cannot stream required archive data. Please check the network connection. 
-Chyba může být způsobena tím, že jste nenainstalovali češtinu do adresáře se hrou. 
-Nebo jste nainstalovali do jiné verze hry, než je požadovaná. Může se vztahovat i na požadovanou lokalizaci (enUS, enGB)</p>'. 
-
-'<p><strong>Po nainstalování češtiny nemám žádné výpravy (questy) česky</strong><br> 
-Zkontrolujte si v přihlášení, jestli máte povolený addon CzWoW v seznamu addonů.</p>'. 
-
-'<p><strong>Addon mi hlásí spoustu chyb.</strong><br> 
-Chyba může být způsobena kolizí s jinými addony. Vyzkoušejte spuštění hry pouze s addonem CzWoW.</p>'. 
-
-'<p><strong>Ve hře se mi špatně zobrazuje diakritika (háčky, čárky)</strong><br> 
-Chyba je způsobena chybějícími fonty do hry. Potřebné fonty si stáhněte mezi soubory ke stažení.</p>'. 
-
-'<p><strong>Mám nainstalovánu češtinu a nejde mi spustit Wow.exe.</strong><br> 
-Pokud chcete opět spouštět hru přes původní Wow.exe v angličtině, musíte češtinu nejprve odinstalovat ze systému. Především se jedná o soubor Data/enGB/patch-enGB-5.MPQ či Data/enUS/patch-enUS-5.MPQ, který je nutno smazat. U novějších verzí se soubor může jmenovat wow-update-base-50000.MPQ.</p>'. 
-
-'<p><strong>Jak mám hru spustit?</strong><br> 
-Hru musíte spustit přes soubor WowLua.exe v kořenovém adresáři hry.</p>'. 
-
-'<p><strong>Mohu použít tuto češtinu na oficiálních serverech?</strong><br> 
+'<p><strong>Po nainstalování češtiny a spouštění přes soubor WoWlua.exe mi klesl výrazně výkon</strong><br>
+Problém může být spojen s použitím integrované grafiky místo herní.</p>'.
+
+'<p><strong>Při spouštění hry přes soubor WoWLua.exe se mi neukládá žádné nastavení addonů a podobně</strong><br>
+Problém může být způsoben špatně nastavenými právy u souboru WoWLua.exe. Můžete přenastavit práva, nebo spouštět jako správce.</p>'.
+
+'<p><strong>Po spuštění souboru WoWLua.exe mi píše chybu:</strong><br>
+Cannot stream required archive data. Please check the network connection.
+Chyba může být způsobena tím, že jste nenainstalovali češtinu do adresáře se hrou.
+Nebo jste nainstalovali do jiné verze hry, než je požadovaná. Může se vztahovat i na požadovanou lokalizaci (enUS, enGB)</p>'.
+
+'<p><strong>Po nainstalování češtiny nemám žádné výpravy (questy) česky</strong><br>
+Zkontrolujte si v přihlášení, jestli máte povolený addon CzWoW v seznamu addonů.</p>'.
+
+'<p><strong>Addon mi hlásí spoustu chyb.</strong><br>
+Chyba může být způsobena kolizí s jinými addony. Vyzkoušejte spuštění hry pouze s addonem CzWoW.</p>'.
+
+'<p><strong>Ve hře se mi špatně zobrazuje diakritika (háčky, čárky)</strong><br>
+Chyba je způsobena chybějícími fonty do hry. Potřebné fonty si stáhněte mezi soubory ke stažení.</p>'.
+
+'<p><strong>Mám nainstalovánu češtinu a nejde mi spustit Wow.exe.</strong><br>
+Pokud chcete opět spouštět hru přes původní Wow.exe v angličtině, musíte češtinu nejprve odinstalovat ze systému. Především se jedná o soubor Data/enGB/patch-enGB-5.MPQ či Data/enUS/patch-enUS-5.MPQ, který je nutno smazat. U novějších verzí se soubor může jmenovat wow-update-base-50000.MPQ.</p>'.
+
+'<p><strong>Jak mám hru spustit?</strong><br>
+Hru musíte spustit přes soubor WowLua.exe v kořenovém adresáři hry.</p>'.
+
+'<p><strong>Mohu použít tuto češtinu na oficiálních serverech?</strong><br>
 Ne úplně, protože se vystavujete riziku zablokování vašeho účtu z důvodu použití upravené hry. Na oficiálním serveru lze využít pouze Addon s češtinou CzWoW. Instalační soubor určený pro oficiální servery je už takto přizpůsoben.</p>'.
-  
+
 '</td><td>';
 
@@ -631 +631 @@
 
   $Output .= '</td></tr></table>'.
- 
- 
+
+
   '</body></html>';
   return $Output;
-}  
-  
+}
+
   function ExportToXML()
   {
     global $TranslationTree;
-  
+
     $this->LoadFilters();
 
@@ -653 +653 @@
     foreach(explode(',', $this->UserNames) as $UserName)
       $Buffer .= "      <user>".$UserName."</user>\n";
-    $Buffer .= 
+    $Buffer .=
     "    </contributors>\n".
     "  </meta>\n".
@@ -659 +659 @@
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
-        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+      'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
@@ -669 +669 @@
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($Line = $DbResult2->fetch_assoc()) 
+      while($Line = $DbResult2->fetch_assoc())
       {
         $Buffer .= '      <item id="'.$Line['Entry'].'" user="'.$Line['UserName'].'">'."\n";
@@ -681 +681 @@
         }
         $Buffer .= "      </item>\n";
-      }    
+      }
       $Buffer .= "    </group>\n";
     }
@@ -688 +688 @@
   "</document>";
     return($Buffer);
-  }    
+  }
 }
 
@@ -706 +706 @@
     $this->Dependencies = array();
   }
-  
+
   function Start()
   {
-        $this->System->RegisterPage('export', 'PageExport');
-        $this->System->RegisterMenuItem(array(
-        'Title' => 'Exporty',
-        'Hint' => 'Zde si můžete stáhnout přeložené texty',
-        'Link' => $this->System->Link('/export/'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterPage('export', 'PageExport');
+    $this->System->RegisterMenuItem(array(
+      'Title' => 'Exporty',
+      'Hint' => 'Zde si můžete stáhnout přeložené texty',
+      'Link' => $this->System->Link('/export/'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 2);
   }

trunk/Modules/Export/ExportOutput.php

@@ -17 +17 @@
       //echo($Path.$FileName.'<br />');
       if(is_dir($Path.$FileName)) CreateZipFromDir($Zip, $Path.$FileName.'/', $ZipPath.$FileName.'/');
-        else $Zip->addFile(file_get_contents($Path.$FileName), $ZipPath.$FileName); 
-    }          
+        else $Zip->addFile(file_get_contents($Path.$FileName), $ZipPath.$FileName);
+    }
   }
 }
@@ -25 +25 @@
 {
   global $System, $Config;
-  
-  $Output = '';
-  $Export = new Export($System);
-  $Export->Id = $ExportId;
-  $Export->Init(); 
-  if(function_exists('gzcompress')) 
+
+  $Output = '';
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
+  if(function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzAoWoW_SQL.zip';
-    $SQLFilename = 'CzAoWoW_SQL.sql';        
+    $SQLFilename = 'CzAoWoW_SQL.sql';
     $BufferZip = $Export->ExportToAoWoWSQL();
     $ZipFile = new zipfile();
@@ -43 +43 @@
   //  'setTimeout("parent.location.href=\''.$SaveFilename.'\'", 3000)'.
   //  '</script>';
-      
-  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '. 
+
+  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '.
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzAoWoW_SQL.zip').'">'.$SQLFilename.'</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
@@ -53 +53 @@
 {
   global $System, $Config;
-  
-  $Export = new Export($System);
-  $Export->Id = $ExportId;
-  
+
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+
   $Output = 'Vygenerovaný SQL kód: <br /><pre class="SQLCode">'.
      htmlspecialchars($Export->ExportToAoWoWSQL()).
@@ -66 +66 @@
 {
   global $System, $Config;
-  
-  $Output = '';
-  $Export = new Export($System);
-  $Export->Id = $ExportId;
-  $Export->Init();
-  if(function_exists('gzcompress')) 
+
+  $Output = '';
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
+  if(function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzWoW_SQL.zip';
-    $SQLFilename = 'CzWoW_SQL.sql';        
+    $SQLFilename = 'CzWoW_SQL.sql';
     $BufferZip = $Export->ExportToMangosSQL();
     $ZipFile = new zipfile();
@@ -84 +84 @@
   //  'setTimeout("parent.location.href=\''.$SaveFilename.'\'", 3000)'.
   //  '</script>';
-      
-  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '. 
+
+  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '.
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_SQL.zip').'">'.$SQLFilename.'</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
-  return($Output);  
+  return($Output);
 }
 
@@ -94 +94 @@
 {
   global $System;
-  
+
   $Export = new Export($System);
   $Export->Id = $ExportId;
@@ -107 +107 @@
 {
   global $System;
-  
-  if(function_exists('gzcompress')) 
+
+  if(function_exists('gzcompress'))
   {
     $Addon = new ExportAddon($System);
@@ -114 +114 @@
     $Addon->Init();
     $Output = $Addon->MakeAddon();
-    
+
     $Output .= 'Generování addonu...<br />';
-    $SaveFilename = $Addon->TempDir.'CzWoW_Addon-'.$Addon->ClientVersion['Version'].'.zip';          
+    $SaveFilename = $Addon->TempDir.'CzWoW_Addon-'.$Addon->ClientVersion['Version'].'.zip';
     $Zip = new zipfile();
     CreateZipFromDir($Zip, $Addon->TempDir.'CzWoW/', 'CzWoW/');
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/OptionsFrame.xml'), 'CzWoW/OptionsFrame.xml'); 
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.xml'), 'CzWoW/CzWoW.xml'); 
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.toc'), 'CzWoW/CzWoW.toc'); 
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.lua'), 'CzWoW/CzWoW.lua'); 
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/GameMenuFrame.xml'), 'CzWoW/GameMenuFrame.xml'); 
-    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/Localization.lua'), 'CzWoW/Localization.lua'); 
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/OptionsFrame.xml'), 'CzWoW/OptionsFrame.xml');
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.xml'), 'CzWoW/CzWoW.xml');
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.toc'), 'CzWoW/CzWoW.toc');
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/CzWoW.lua'), 'CzWoW/CzWoW.lua');
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/GameMenuFrame.xml'), 'CzWoW/GameMenuFrame.xml');
+    $Zip->addFile(file_get_contents(dirname(__FILE__).'/files/'.$Addon->ClientVersion['Version'].'/CzWoW/Localization.lua'), 'CzWoW/Localization.lua');
     $Buffer = $Zip->file();
     file_put_contents($SaveFilename, $Buffer);
@@ -132 +132 @@
   //  'setTimeout("parent.location.href=\''.$SaveFilename.'\'", 3000)'.
   //  '</script>';
-      
-  $Output .= 'Soubor ke stažení: '. 
+
+  $Output .= 'Soubor ke stažení: '.
     '<a href="'.$System->Link('/'.$Addon->TempDirRelative.'CzWoW_Addon-'.$Addon->ClientVersion['Version'].'.zip').'">CzWoW_Addon-'.$Addon->ClientVersion['Version'].'.zip</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
@@ -143 +143 @@
 {
   global $Config, $System;
-  
-  $Output = '';
-  $Export = new Export($System);
-  $Export->Id = $ExportId;
-  $Export->Init();
-  if(function_exists('gzcompress')) 
+
+  $Output = '';
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
+  if(function_exists('gzcompress'))
   {
     $SaveFilename = $Export->TempDir.'CzWoW_XML.zip';
-    $SQLFilename = 'CzWoW_XML.sql';        
+    $SQLFilename = 'CzWoW_XML.sql';
     $BufferZip = $Export->ExportToXML();
     $ZipFile = new zipfile();
@@ -161 +161 @@
   // 'setTimeout("parent.location.href=\''.$SaveFilename.'\'", 3000)'.
   // '</script>';
-      
-  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '. 
+
+  $Output .= 'Pokud nezačalo stahování, soubor by mělo jít stáhnout pomocí tohoto odkazu: '.
     '<a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_XML.zip').'">CzWoW_SQL.zip</a><br />'.
     'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.';
@@ -171 +171 @@
 {
   global $System;
-  
+
   $Export = new Export($System);
   $Export->Id = $ExportId;
@@ -188 +188 @@
   $Export->Id = $ExportId;
   $Export->Init();
-  
+
   $Output = '';
   if(array_key_exists('Regenerate', $_POST))
@@ -199 +199 @@
   $Output .= '<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />';
   $Output .= 'U DBC souborů export textů funguje jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br />DBC soubory je nutné zabalit do souboru patch-enGB-5.MPQ uvnitř složky "DBFilesClient" a hru spouštět přes upravený spouštěcí soubor. Zabalit je můžete pomocí programu <a href="../download/mpqediten32.zip">Ladik\'s MPQ Editor</a>. Stav vygenerování můžete sledovat na této stránce.<br /><br />';
-    
+
   $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
   if($DbResult->num_rows == 0)
@@ -206 +206 @@
     $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);
-  }  
-  
+  }
+
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
@@ -216 +216 @@
     while($Group = $DbResult->fetch_assoc())
     {
-      if(file_exists($Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc')) 
-        $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'dbc/'.$Group['DBCFileName'].'.dbc').'">'.$Group['DBCFileName'].'.dbc</a><br/>';
+      if(file_exists($Export->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc'))
+        $Output .= '<a href="'.$System->Link('/'.$Export->TempDirRelative.'dbc/'.$Group['DBCFileName'].'.dbc').'">'.$Group['DBCFileName'].'.dbc</a><br/>';
     }
   } else {
     $Output .= ShowProgress($Export);
 
-  } 
+  }
   return($Output);
 }
@@ -232 +232 @@
 
 
-        $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
+      $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
                '<script>'.
                   '$(document).ready(function() {'.
@@ -241 +241 @@
                '</script>';
 
-    
+
       $Output .= ' <strong><div id="progress"></div></strong><br />';
 
@@ -248 +248 @@
     if($DbResult->num_rows > 0) {
       $System->ModuleManager->Modules['Log']->WriteLog('ProcesTask nepracuje přes 2 hodiny, pravděpodobně nepracuje!', LOG_TYPE_ERROR);
-  
+
     }
     return ($Output);
@@ -256 +256 @@
 {
   global $System;
-  
+
   $Export = new Export($System);
   $Export->Id = $ExportId;
@@ -272 +272 @@
   $Output .= '<form action="?Action=View&amp;Tab=7&amp;ExportId='.$ExportId.'" method="post"><input type="submit" name="Regenerate" value="Přegenerovat"/></form><br />';
   $Output .= 'U souhrné instalace češtiny funguje export textů jinak, protože generování je náročné, jsou požadavky zařazovány do fronty a postupně zpracovávány.<br /><br />';
-    
+
   $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$ExportId);
   if($DbResult->num_rows == 0)
@@ -278 +278 @@
     $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$ExportId.', NOW())');
     $System->ModuleManager->Modules['Log']->WriteLog('Zadání úlohy pro vygenerování dbc souboru', LOG_TYPE_DOWNLOAD);
-  }  
-  
+  }
+
   $DbResult = $System->Database->query('SELECT * FROM `ExportTask` WHERE `Export` = '.$ExportId);
   $ExportTask = $DbResult->fetch_assoc();
@@ -287 +287 @@
 
   } else {
-    
+
     $Output .= ShowProgress($Export);
   }
@@ -296 +296 @@
 {
   global $System, $Config;
-  
-  $Export = new Export($System);
-  $Export->Id = $ExportId;
-  $Export->Init();
-
-  if(function_exists('gzcompress')) 
+
+  $Export = new Export($System);
+  $Export->Id = $ExportId;
+  $Export->Init();
+
+  if(function_exists('gzcompress'))
   {
     $Output = 'Generování lua souborů...<br />';
     $Export->ExportToLua();
-    $SaveFilename = $Export->TempDir.'CzWoW_Lua.zip';          
+    $SaveFilename = $Export->TempDir.'CzWoW_Lua.zip';
     $ZipFile = new zipfile();
     CreateZipFromDir($ZipFile, $Export->TempDir.'lua/', '');
@@ -315 +315 @@
   //  'setTimeout("parent.location.href=\''.$SaveFilename.'\'", 3000)'.
   //  '</script>';
-      
-  $Output .= '<strong>Soubory:</strong><br/>'.  
+
+  $Output .= '<strong>Soubory:</strong><br/>'.
     'Souhrný archív <a href="'.$System->Link('/'.$Export->TempDirRelative.'CzWoW_Lua.zip').'">CzWoW_Lua.zip</a><br />';
   $DbResult = $System->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$Export->Id.' AND `Group`.`LuaFileName` != ""');

trunk/Modules/Export/Page.php

@@ -14 +14 @@
 class PageExport extends Page
 {
-        function ExportList()
-        {
-                $Output = '<a href="?Action=ViewList">'.T('All').'</a>';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        $Output .= ' <a href="?Action=ViewList&amp;Filter=Others">Ostatních</a>'.
-                                        ' <a href="?Action=ViewList&amp;Filter=My">'.T('Mine').'</a>';
-                }
-        
-                if($this->System->User->Licence(LICENCE_USER))
-                        $Output .= '<br/><div style="text-align: center;"><a href="?Action=Create">'.T('Create new export').'</a></div><br/>';
-                
-                $Filter = '';
-                if(array_key_exists('Filter', $_GET))
-                {
-                        if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
-                        if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$this->System->User->Id;
-                }
-        
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $Output .= '<h3>'.T('List of export').'</h3>'.
-                                $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')),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'TimeCreate', 1);
-                $Output .= '<table class="BaseTable">'.
-                                $Order['Output'];
-        
-                $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, '.
+  function ExportList()
+  {
+    $Output = '<a href="?Action=ViewList">'.T('All').'</a>';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $Output .= ' <a href="?Action=ViewList&amp;Filter=Others">Ostatních</a>'.
+          ' <a href="?Action=ViewList&amp;Filter=My">'.T('Mine').'</a>';
+    }
+
+    if($this->System->User->Licence(LICENCE_USER))
+      $Output .= '<br/><div style="text-align: center;"><a href="?Action=Create">'.T('Create new export').'</a></div><br/>';
+
+    $Filter = '';
+    if(array_key_exists('Filter', $_GET))
+    {
+      if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$this->System->User->Id;
+      if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$this->System->User->Id;
+    }
+
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= '<h3>'.T('List of export').'</h3>'.
+        $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')),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'TimeCreate', 1);
+    $Output .= '<table class="BaseTable">'.
+        $Order['Output'];
+
+    $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, '.
       '(SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`, '.
       '(SELECT Id FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersionId`, '.
@@ -62 +62 @@
       '(SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` '.
       'LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
-                while($Export = $DbResult->fetch_assoc())
-                {
-                        $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0">'.T('View').'</a> '.
-                          '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7">'.T('Make export').'</a>';
-                        if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy delete item?').'\');">'.T('Delete').'</a>';
-                        if($this->System->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.php?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
-                                        '<td>'.$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'];
-        
-                return($Output);
-        }
-        
-        function ExportCreate()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
-                        $DbRow = $DbResult->fetch_row();
-                        if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
-                        {
-                                $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>';
-                        } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ExportCreateFinish()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
-                        {
-                                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
-                                $DbRow = $DbResult->fetch_row();
-                                if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
-                                {
-                                        $this->System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$this->System->User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
-                                        $ExportId = $this->System->Database->insert_id;
-                                        $Output = ShowMessage(T('New export created.<br />Direct link to export').': <a href="?Action=View&amp;ExportId='.$ExportId.'">'.T('here').'</a>');
-                                        $this->System->ModuleManager->Modules['Log']->WriteLog(T('New export created').' <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">'.$ExportId.'</a>.', LOG_TYPE_EXPORT);
-                                        $_GET['Filter'] = 'my';
-                                        $this->ExportList();
-                                } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').' '.$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
-                        } else $Output = ShowMessage(T('Missing data in form.'), MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ExportDelete()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$this->System->User->Id.')');
-                        if($DbResult->num_rows > 0)
-                        {
-                                $this->System->Database->query('DELETE FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId']);
-                                $this->System->Database->query('DELETE FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
-                                $this->System->Database->query('DELETE FROM `ExportLanguage` WHERE `Export`='.$_GET['ExportId']);
-                                $this->System->Database->query('DELETE FROM `ExportTask` WHERE `Export`='.$_GET['ExportId']);
-                                $this->System->Database->query('DELETE FROM `ExportUser` WHERE `Export`='.$_GET['ExportId']);
-                                $this->System->Database->query('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                                DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
-                                $Output = ShowMessage(T('Export deleted.'));
-                                $_GET['Filter'] = 'my';
-                                $this->System->ModuleManager->Modules['Log']->WriteLog('Smazán export '.$_GET['ExportId'], LOG_TYPE_EXPORT);
-                                $Output .= $this->ExportList();
-                        } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function SaveAllUsers()
-        {
-         global $System;
-            $Export = new Export($System);
+    while($Export = $DbResult->fetch_assoc())
+    {
+      $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0">'.T('View').'</a> '.
+        '<a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7">'.T('Make export').'</a>';
+      if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy delete item?').'\');">'.T('Delete').'</a>';
+      if($this->System->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.php?user='.$Export['User']).'">'.$Export['UserName'].'</a></td>'.
+          '<td>'.$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'];
+
+    return($Output);
+  }
+
+  function ExportCreate()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
+      $DbRow = $DbResult->fetch_row();
+      if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+      {
+        $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>';
+      } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ExportCreateFinish()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
+      {
+        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
+        $DbRow = $DbResult->fetch_row();
+        if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+        {
+          $this->System->Database->query('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$this->System->User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
+          $ExportId = $this->System->Database->insert_id;
+          $Output = ShowMessage(T('New export created.<br />Direct link to export').': <a href="?Action=View&amp;ExportId='.$ExportId.'">'.T('here').'</a>');
+          $this->System->ModuleManager->Modules['Log']->WriteLog(T('New export created').' <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">'.$ExportId.'</a>.', LOG_TYPE_EXPORT);
+          $_GET['Filter'] = 'my';
+          $this->ExportList();
+        } else $Output = ShowMessage(T('You can\'t create another export. Max for one user is').' '.$this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage(T('Missing data in form.'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ExportDelete()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE (`Id`='.($_GET['ExportId'] * 1).') AND (`User`='.$this->System->User->Id.')');
+      if($DbResult->num_rows > 0)
+      {
+        $this->System->Database->query('DELETE FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId']);
+        $this->System->Database->query('DELETE FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
+        $this->System->Database->query('DELETE FROM `ExportLanguage` WHERE `Export`='.$_GET['ExportId']);
+        $this->System->Database->query('DELETE FROM `ExportTask` WHERE `Export`='.$_GET['ExportId']);
+        $this->System->Database->query('DELETE FROM `ExportUser` WHERE `Export`='.$_GET['ExportId']);
+        $this->System->Database->query('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+        DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
+        $Output = ShowMessage(T('Export deleted.'));
+        $_GET['Filter'] = 'my';
+        $this->System->ModuleManager->Modules['Log']->WriteLog('Smazán export '.$_GET['ExportId'], LOG_TYPE_EXPORT);
+        $Output .= $this->ExportList();
+      } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function SaveAllUsers()
+  {
+   global $System;
+      $Export = new Export($System);
       $Export->Id = $_GET['ExportId'];
       $Export->SaveAllUsers();
-      
-  }
-        
-        function ExportViewTranslators()
-        {
-                global $TranslationTree;
-        
-                $Output = '';
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                $Export = $DbResult->fetch_assoc();
-                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                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)
-                                {
-                                        if(substr($Index, 0, 3) == 'seq')
-                                        {
-                                                $UserId = substr($Index, 3) * 1;
-                                                if(array_key_exists('sel'.$UserId, $_POST)) $Selected = true;
-                                                else $Selected = false;
-                                                $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `User`='.$UserId;
-                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition);
-                                                if($DbResult->num_rows > 0)
-                                                {
-                                                        if(!$Selected) $this->System->Database->query('DELETE FROM `ExportUser` '.$Condition);
-                                                        else $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
-                                                } else
-                                                {
-                                                        if($Selected) $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
-                                                }
-                                        }
-                                }
-        
-                          if (array_key_exists('AllUsers', $_POST)) { 
+
+  }
+
+  function ExportViewTranslators()
+  {
+    global $TranslationTree;
+
+    $Output = '';
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $Export = $DbResult->fetch_assoc();
+    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    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)
+        {
+          if(substr($Index, 0, 3) == 'seq')
+          {
+            $UserId = substr($Index, 3) * 1;
+            if(array_key_exists('sel'.$UserId, $_POST)) $Selected = true;
+            else $Selected = false;
+            $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `User`='.$UserId;
+            $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition);
+            if($DbResult->num_rows > 0)
+            {
+              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportUser` '.$Condition);
+              else $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
+            } else
+            {
+              if($Selected) $this->System->Database->query('INSERT INTO `ExportUser` (`Export`, `User`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$UserId.', '.$Value.')');
+            }
+          }
+        }
+
+        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
+            $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
+            //update export stat
             $Export['AllUsers'] = 0;
-                                                $this->System->Database->query('UPDATE `Export` SET `AllUsers`=0 WHERE `Id`='.$_GET['ExportId']);
+            $this->System->Database->query('UPDATE `Export` SET `AllUsers`=0 WHERE `Id`='.$_GET['ExportId']);
           }
 
-                                // Recalculate sequence number
-                                $this->System->Database->query('SET @I = 0');
-                                $this->System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
-                                $Output .= ShowMessage(T('Select saved.'));
-                        }
-                }
-        
-                $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')),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
-                if($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
-                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';
-                $Query .=' LEFT JOIN `ExportUser` ON `ExportUser`.`Export` = '.$_GET['ExportId'].' AND `ExportUser`.`User`=`T`.`ID`';
-                $Query .=' WHERE `T`.`TranslatedCount` > 0 ORDER BY COALESCE(`ExportUser`.`Sequence`, 100000000)'.$InitialOrder.') AS `TT`';
-        
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $Output .= '<form name="Translators" action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-                                '<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.');
-                }
-        
-                $Output .= $PageList['Output'].
-                '<table class="BaseTable">'.
-                $Order['Output'];
-        
-                $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
-                $this->System->Database->query('SET @I = 0');
-                $DbResult = $this->System->Database->query($Query);
-                while($UserLine = $DbResult->fetch_assoc())
-                {
-                        $XP = GetLevelMinMax($UserLine['XP']);
-                        $Checked = $UserLine['Sequence'] != '';
-                        $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', ((!$Editable) or ($Export['AllUsers'])));
-                        $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>';
-                }
-                $Output .= '</table>'.
-                                '</form>'.
-                                $PageList['Output'];
-                return($Output);
-        }
-        
-        function ExportViewGeneral()
-        {
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                $DisabledTextArea = array(false => ' readonly="yes"', true => '');
-                $Output = '<h3>Obecná nastavení</h3>';
-                $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                $Export = $DbRows->fetch_assoc();
-                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                else $Editable = false;
-        
-                if(array_key_exists('Operation', $_POST))
-                        if($_POST['Operation'] == 'Save')  if($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
-                        {
-                                if(array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1;
-                                else $WithDiacritic = 0;
-                                if (array_key_exists('Featured', $_POST)) $Export['Featured'] = 1;
-                                $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Featured`='.$Export['Featured'].', `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
-                                $Export['Title'] = $_POST['Title'];
-                                $Export['Description'] = $_POST['Description'];
-                                $Export['WithDiacritic'] = $WithDiacritic;
-                                $Output .= ShowMessage('Nastavení uloženo.');
-                        }
-        
-                        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($this->System->User->Id != null)
-                        {
-                                $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
-                                                '<tr><td colspan="2">';
+        // Recalculate sequence number
+        $this->System->Database->query('SET @I = 0');
+        $this->System->Database->query('UPDATE `ExportUser` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
+        $Output .= ShowMessage(T('Select saved.'));
+      }
+    }
+
+    $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')),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
+    if($Order['Column'] != 'Sequence2') $InitialOrder = ', '.substr($Order['SQL'], 10);
+    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';
+    $Query .=' LEFT JOIN `ExportUser` ON `ExportUser`.`Export` = '.$_GET['ExportId'].' AND `ExportUser`.`User`=`T`.`ID`';
+    $Query .=' WHERE `T`.`TranslatedCount` > 0 ORDER BY COALESCE(`ExportUser`.`Sequence`, 100000000)'.$InitialOrder.') AS `TT`';
+
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `X`');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= '<form name="Translators" action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
+        '<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.');
+    }
+
+    $Output .= $PageList['Output'].
+    '<table class="BaseTable">'.
+    $Order['Output'];
+
+    $Query = 'SELECT * FROM ('.$Query.') AS `TX` '.$Order['SQL'].$PageList['SQLLimit'];
+    $this->System->Database->query('SET @I = 0');
+    $DbResult = $this->System->Database->query($Query);
+    while($UserLine = $DbResult->fetch_assoc())
+    {
+      $XP = GetLevelMinMax($UserLine['XP']);
+      $Checked = $UserLine['Sequence'] != '';
+      $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', ((!$Editable) or ($Export['AllUsers'])));
+      $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>';
+    }
+    $Output .= '</table>'.
+        '</form>'.
+        $PageList['Output'];
+    return($Output);
+  }
+
+  function ExportViewGeneral()
+  {
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    $DisabledTextArea = array(false => ' readonly="yes"', true => '');
+    $Output = '<h3>Obecná nastavení</h3>';
+    $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $Export = $DbRows->fetch_assoc();
+    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    else $Editable = false;
+
+    if(array_key_exists('Operation', $_POST))
+      if($_POST['Operation'] == 'Save')  if($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
+      {
+        if(array_key_exists('WithDiacritic', $_POST)) $WithDiacritic = 1;
+        else $WithDiacritic = 0;
+        if (array_key_exists('Featured', $_POST)) $Export['Featured'] = 1;
+        $this->System->Database->query('UPDATE `Export` SET `Title`="'.$_POST['Title'].'", `Featured`='.$Export['Featured'].', `Description`="'.$_POST['Description'].'", `WithDiacritic`='.$WithDiacritic.' WHERE Id='.$Export['Id']);
+        $Export['Title'] = $_POST['Title'];
+        $Export['Description'] = $_POST['Description'];
+        $Export['WithDiacritic'] = $WithDiacritic;
+        $Output .= ShowMessage('Nastavení uloženo.');
+      }
+
+      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($this->System->User->Id != null)
+      {
+        $Output .= '<input type="hidden" name="Operation" value="Save"/>'.
+            '<tr><td colspan="2">';
         if($Editable) $Output .= ' <input type="submit" value="Uložit" '.$DisabledInput[$Editable].'/>';
-        $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a> ';
+        $Output .= ' <a href="?Action=Clone&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\''.T('Realy clone item?').'\');">'.T('Clone').'</a> ';
         if($this->System->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="'.$Export['Title'].'"'.$DisabledInput[$Editable].'/></td></tr>'.
-                                        '<tr><td>Popis:</td><td><textarea name="Description" cols="54" rows="10"'.$DisabledTextArea[$Editable].'>'.$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);
-        }
-        
-        function ExportViewLanguages()
-        {
-                global $TranslationTree;
-        
-                $Output = '';
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                $Export = $DbRows->fetch_assoc();
-                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                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)
-                                {
-                                        if(substr($Index, 0, 3) == 'seq')
-                                        {
-                                                $LanguageId = substr($Index, 3) * 1;
-                                                if(array_key_exists('sel'.$LanguageId, $_POST)) $Selected = true;
-                                                else $Selected = false;
-                                                $Condition = ' WHERE Export='.$_GET['ExportId'].' AND `Language`='.$LanguageId;
-                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportLanguage` '.$Condition);
-                                                if($DbResult->num_rows > 0)
-                                                {
-                                                        if(!$Selected) $this->System->Database->query('DELETE FROM `ExportLanguage` '.$Condition);
-                                                        else $this->System->Database->query('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
-                                                } else
-                                                {
-                                                        if($Selected) $this->System->Database->query('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
-                                                }
-                                        }
-                                }
-        
-                                // Recalculate sequence number
-                                $this->System->Database->query('SET @I = 0');
-                                $this->System->Database->query('UPDATE `ExportLanguage` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
-                                $Output .= ShowMessage('Výběr uložen.');
-                        }
-                }
-        
-                $Query = 'SELECT (@I := @I + 1) AS `Sequence2`, `Sequence`, `Language`.`Id`, `Name` FROM `Language`';
-                $Query .=' LEFT JOIN `ExportLanguage` ON `ExportLanguage`.`Export` = '.$_GET['ExportId'].' AND `ExportLanguage`.`Language`=`Language`.`Id`';
-                $Query .=' WHERE `Language`.`Enabled` = 1 ORDER BY COALESCE(`Sequence`, 100)';
-        
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $TableColumns = array(
-                                array('Name' => 'Name', 'Title' => T('Name')),
-                                array('Name' => '', 'Title' => T('Select')),
-                                array('Name' => 'Sequence2', 'Title' => T('Order')),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'Sequence2');
-                $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-                                '<h3>'.T('Languages').'</h3>';
-                if($Editable)
-                {
-                        $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
-                                        '<input type="hidden" name="Operation" value="Save"/>'.
-                                        '<br />'.
-                                        T('Select languades from list witch you want to export from. And edit theirs 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.');
-                }
-        
-                $Output .= $PageList['Output'].
-                '<table class="BaseTable">'.
-                $Order['Output'];
-        
-                $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
-                $this->System->Database->query('SET @I = 0');
-                $DbResult = $this->System->Database->query($Query);
-                while($Langugage = $DbResult->fetch_assoc())
-                {
-                        $Checked = $Langugage['Sequence'] != '';
-                        $Selection = CheckBox('sel'.$Langugage['Id'], $Checked, '', 'CheckBox', !$Editable);
-                        $Sequence = '<input type="text" name="seq'.$Langugage['Id'].'" style="text-align: center; width: 40px;" value="'.$Langugage['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
-                        $Output .= '<tr>
-                        <td>'.$Langugage['Name'].'</td>
-                        <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>';
-                }
-                $Output .= '</table>'.
-                                '</form>'.
-                                $PageList['Output'];
-                return($Output);
-        }
-        
-        function ExportViewGroups()
-        {
-                global $TranslationTree;
-        
-                $Output = '';
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                $DbRows = $this->System->Database->query('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
-                $Export = $DbRows->fetch_assoc();
-                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                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)
-                                {
-                                        if(substr($Index, 0, 3) == 'seq')
-                                        {
-                                                $GroupId = substr($Index, 3) * 1;
-                                                if(array_key_exists('sel'.$GroupId, $_POST)) $Selected = true;
-                                                else $Selected = false;
-                                                $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `Group`='.$GroupId;
-                                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroup` '.$Condition);
-                                                if($DbResult->num_rows > 0)
-                                                {
-                                                        if(!$Selected) $this->System->Database->query('DELETE FROM `ExportGroup` '.$Condition);
-                                                } else
-                                                {
-                                                        if($Selected) $this->System->Database->query('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
-                                                }
-                                        }
-                                }
-                                $Output .= ShowMessage(T('Select saved.'));
-                        }
-          //items
-      foreach($TranslationTree as $Group) 
-                {
-                //  echo $Group['Id'].' ';
+      }
+      $Output .= '<tr><td>'.T('Identification').':</td><td><input type="text" style="width: 400px" name="Title" value="'.$Export['Title'].'"'.$DisabledInput[$Editable].'/></td></tr>'.
+          '<tr><td>Popis:</td><td><textarea name="Description" cols="54" rows="10"'.$DisabledTextArea[$Editable].'>'.$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);
+  }
+
+  function ExportViewLanguages()
+  {
+    global $TranslationTree;
+
+    $Output = '';
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $Export = $DbRows->fetch_assoc();
+    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    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)
+        {
+          if(substr($Index, 0, 3) == 'seq')
+          {
+            $LanguageId = substr($Index, 3) * 1;
+            if(array_key_exists('sel'.$LanguageId, $_POST)) $Selected = true;
+            else $Selected = false;
+            $Condition = ' WHERE Export='.$_GET['ExportId'].' AND `Language`='.$LanguageId;
+            $DbResult = $this->System->Database->query('SELECT * FROM `ExportLanguage` '.$Condition);
+            if($DbResult->num_rows > 0)
+            {
+              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportLanguage` '.$Condition);
+              else $this->System->Database->query('UPDATE `ExportLanguage` SET `Sequence`='.$Value.$Condition);
+            } else
+            {
+              if($Selected) $this->System->Database->query('INSERT INTO `ExportLanguage` (`Export`, `Language`, `Sequence`) VALUES ('.$_GET['ExportId'].', '.$LanguageId.', '.$Value.')');
+            }
+          }
+        }
+
+        // Recalculate sequence number
+        $this->System->Database->query('SET @I = 0');
+        $this->System->Database->query('UPDATE `ExportLanguage` SET `Sequence` = (@I := @I + 1) WHERE `Export`='.$_GET['ExportId'].' ORDER BY `Sequence`;');
+        $Output .= ShowMessage('Výběr uložen.');
+      }
+    }
+
+    $Query = 'SELECT (@I := @I + 1) AS `Sequence2`, `Sequence`, `Language`.`Id`, `Name` FROM `Language`';
+    $Query .=' LEFT JOIN `ExportLanguage` ON `ExportLanguage`.`Export` = '.$_GET['ExportId'].' AND `ExportLanguage`.`Language`=`Language`.`Id`';
+    $Query .=' WHERE `Language`.`Enabled` = 1 ORDER BY COALESCE(`Sequence`, 100)';
+
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $TableColumns = array(
+        array('Name' => 'Name', 'Title' => T('Name')),
+        array('Name' => '', 'Title' => T('Select')),
+        array('Name' => 'Sequence2', 'Title' => T('Order')),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'Sequence2');
+    $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
+        '<h3>'.T('Languages').'</h3>';
+    if($Editable)
+    {
+      $Output .= '<input type="submit" value="'.T('Save').'" '.$DisabledInput[$Editable].'/>'.
+          '<input type="hidden" name="Operation" value="Save"/>'.
+          '<br />'.
+          T('Select languades from list witch you want to export from. And edit theirs 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.');
+    }
+
+    $Output .= $PageList['Output'].
+    '<table class="BaseTable">'.
+    $Order['Output'];
+
+    $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
+    $this->System->Database->query('SET @I = 0');
+    $DbResult = $this->System->Database->query($Query);
+    while($Langugage = $DbResult->fetch_assoc())
+    {
+      $Checked = $Langugage['Sequence'] != '';
+      $Selection = CheckBox('sel'.$Langugage['Id'], $Checked, '', 'CheckBox', !$Editable);
+      $Sequence = '<input type="text" name="seq'.$Langugage['Id'].'" style="text-align: center; width: 40px;" value="'.$Langugage['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
+      $Output .= '<tr>
+      <td>'.$Langugage['Name'].'</td>
+      <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>';
+    }
+    $Output .= '</table>'.
+        '</form>'.
+        $PageList['Output'];
+    return($Output);
+  }
+
+  function ExportViewGroups()
+  {
+    global $TranslationTree;
+
+    $Output = '';
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    $DbRows = $this->System->Database->query('SELECT * FROM Export WHERE Id='.$_GET['ExportId']);
+    $Export = $DbRows->fetch_assoc();
+    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    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)
+        {
+          if(substr($Index, 0, 3) == 'seq')
+          {
+            $GroupId = substr($Index, 3) * 1;
+            if(array_key_exists('sel'.$GroupId, $_POST)) $Selected = true;
+            else $Selected = false;
+            $Condition = ' WHERE `Export`='.$_GET['ExportId'].' AND `Group`='.$GroupId;
+            $DbResult = $this->System->Database->query('SELECT * FROM `ExportGroup` '.$Condition);
+            if($DbResult->num_rows > 0)
+            {
+              if(!$Selected) $this->System->Database->query('DELETE FROM `ExportGroup` '.$Condition);
+            } else
+            {
+              if($Selected) $this->System->Database->query('INSERT INTO `ExportGroup` (`Export`, `Group`) VALUES ('.$_GET['ExportId'].', '.$GroupId.')');
+            }
+          }
+        }
+        $Output .= ShowMessage(T('Select saved.'));
+      }
+      //items
+      foreach($TranslationTree as $Group)
+      {
+      //  echo $Group['Id'].' ';
         foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
           if(array_key_exists('item'.$Column['Id'], $_POST)) $Selected = true;
@@ -452 +452 @@
           //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'].')');
-                                                }
+          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'].')');
+            }
 
         }
       }
-                }
-        
-                $Query = 'SELECT `Group`.*, `ExportGroup`.`Id` AS `ExportGroupId` FROM `Group` LEFT JOIN `ExportGroup` ON `ExportGroup`.`Export`='.$_GET['ExportId'].' AND `Group`=`Group`.`Id`';
-        
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $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 tranlation')),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'Name');
-                $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
-                                '<h3>Překladové skupiny</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 />';
-                }
-        
-                $Output .= $PageList['Output'].
-                '<table class="BaseTable">'.
-                $Order['Output'];
-
-          $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
-                while($GroupItem = $DbResultItem->fetch_assoc())
-                {
-                  $GroupItems[$GroupItem['GroupItem']] = 1;
-    }
-        
-                $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
-                $DbResult = $this->System->Database->query($Query);
-                while($Group = $DbResult->fetch_assoc())
-                {
+    }
+
+    $Query = 'SELECT `Group`.*, `ExportGroup`.`Id` AS `ExportGroupId` FROM `Group` LEFT JOIN `ExportGroup` ON `ExportGroup`.`Export`='.$_GET['ExportId'].' AND `Group`=`Group`.`Id`';
+
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS X');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $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 tranlation')),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'Name');
+    $Output .= '<form action="?Action=View&amp;ExportId='.$_GET['ExportId'].'" method="post">'.
+        '<h3>Překladové skupiny</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 />';
+    }
+
+    $Output .= $PageList['Output'].
+    '<table class="BaseTable">'.
+    $Order['Output'];
+
+    $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId']);
+    while($GroupItem = $DbResultItem->fetch_assoc())
+    {
+      $GroupItems[$GroupItem['GroupItem']] = 1;
+    }
+
+    $Query = 'SELECT * FROM ('.$Query.') AS TX '.$Order['SQL'].$PageList['SQLLimit'];
+    $DbResult = $this->System->Database->query($Query);
+    while($Group = $DbResult->fetch_assoc())
+    {
       $Columns = '';
       foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
         if ($Column['Visible'])  $Columns .= CheckBox('item'.$Column['Id'], !isset($GroupItems[$Column['Id']]), '', 'CheckBox', !$Editable).' '.$Column['Name'].' <br />';
       }
-                        $Checked = $Group['ExportGroupId'] != '';
-                        $Selection = CheckBox('sel'.$Group['Id'], $Checked, '', 'CheckBox', !$Editable);
-                        $Output .= '<tr>'.
-                                        '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td>'.
-                                        '<td>'.$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>';
-      $Output .=        $Columns.       '</td>';
+      $Checked = $Group['ExportGroupId'] != '';
+      $Selection = CheckBox('sel'.$Group['Id'], $Checked, '', 'CheckBox', !$Editable);
+      $Output .= '<tr>'.
+          '<td>'.$Selection.'<input type="hidden" name="seq'.$Group['Id'].'"/></td>'.
+          '<td>'.$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>';
+      $Output .=  $Columns. '</td>';
       $Output .=     '</tr>';
-                }
-                $Output .= '</table>'.
-                                '</form>'.
-                                $PageList['Output'];
-                return($Output);
-        }
-        
-        function ExportViewOutputFormat()
-        {
-                $Output = '';
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                if(array_key_exists('ExportId', $_GET))
-                {
-                        $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                        if($DbRows->num_rows > 0)
-                        {
-                                $Export = $DbRows->fetch_assoc();
-                                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                                else $Editable = false;
-        
-                                if(array_key_exists('Operation', $_POST))
-                                        if($_POST['Operation'] == 'Save')
-                                        {
-                                                if(array_key_exists('OutputType', $_POST) and ($_POST['OutputType'] * 1 > 0))
-                                                {
-                                                  $this->System->Database->query('UPDATE Export SET OutputType='.$_POST['OutputType'].' WHERE Id='.$_GET['ExportId']);
-                                                  $Output .= ShowMessage(T('Select saved.'));
-                                          } 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>';
-                        } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ExportViewVersion()
-        {
-                $Output = '';
-                $DisabledInput = array(false => ' disabled="disabled"', true => '');
-                $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                $Export = $DbRows->fetch_assoc();
-                if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
-                else $Editable = false;
-        
-                if(array_key_exists('Operation', $_POST))
-                        if(($_POST['Operation'] == 'Save') and (array_key_exists('ClientVersion', $_POST)))
-                        {
-                                $this->System->Database->query('UPDATE `Export` SET `ClientVersion`='.$_POST['ClientVersion'].' WHERE `Id`='.$_GET['ExportId']);
-                                $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);
-        }
-        
-        function ExportViewOutput()
-        {
-                $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 if($Export['ClientVersion'] == '') $Output .= ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
-                else {
-                        $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
-                        if($DbResult->num_rows > 0)
-                        {
-                                $DbResult = $this->System->Database->query('SELECT * FROM `ExportVersion` WHERE (`ExportType`='.$Export['OutputType'].') AND (`ClientVersion`='.$Export['ClientVersion'].')');
-                                if($DbResult->num_rows > 0)
-                                {
-                                  if (array_key_exists('Auto', $_GET) == false)  
-                                          $this->System->Database->query('UPDATE `Export` SET `UsedCount` = `UsedCount` + 1 WHERE `Id`='.$Export['Id']);
-                                        $Output = ExportOutput($Export['Id'], $Export['OutputType']);
-                                } else $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
-                        } else $Output = ShowMessage(T('Format output isn\'t select').'.', MESSAGE_CRITICAL);
-                }
-                return($Output);
-        }
-        
-        function ExportViewStat($Where = '')
-        {
-                $Export = new Export($this->System);
-                $Export->Id = $_GET['ExportId'];
-                $Export->Init();
-                $Export->LoadFilters();
-        
-                if(($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == ''))
-                        $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
-                else {
-                        $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
-                                        ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
-                        $Query = '';
-                        $UnionItems = array();
-                        $DbResult = $this->System->Database->query($GroupListQuery.$Where);
-                        while($DbRow = $DbResult->fetch_assoc())
-                        {
-                                $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` = '.$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);
-        
-                        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
-                        $DbRow = $DbResult->fetch_row();
-                        $PageList = GetPageList($DbRow[0]);
-                        $Output = '<h3>'.T('Statistic of coplection selected groups').'</h3>'.
-                                $PageList['Output'];
-        
-                        $Output .= '<table class="BaseTable">';
-                        $TableColumns = array(
-                                array('Name' => 'Name', 'Title' => T('Name')),
-                                array('Name' => 'Translated', 'Title' => T('Translated count')),
-                                array('Name' => 'Total', 'Title' => T('English')),
-                                array('Name' => 'Percent', 'Title' => T('Percent')),
-                        );
-        
-                        $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
-                        $Output .= $Order['Output'];
-        
-                        $Translated = 0;
-                        $Total = 0;
-                        if(count($UnionItems) > 0)
-                        {
-                                $ID = $this->System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-                                while($Group = $ID->fetch_assoc())
-                                {
-                                        $Output .= '<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
-                                        $Translated += $Group['Translated'];
-                                        $Total += $Group['Total'];
-                                }
-                        }
-                        if($Total > 0) $Percent = $Translated / $Total * 100;
-                        else $Percent = 100;
-        
-                        $Output .= '<tr><td><strong>'.T('Altogether').'</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, round($Percent, 2)).'</strong></td></tr>';
-                        $Output .= '</table>';
-                }
-                return($Output);
-        }
-        
-        function ExportView()
-        {
-                $Output = '';
-                if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
-                {
-                        $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                        if($DbResult->num_rows > 0)
-                        {
-                                $Export = $DbResult->fetch_assoc();
-        
-                                $DbResult = $this->System->Database->query('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
-                                $UserLine = $DbResult->fetch_assoc();
-                                $Output .= 'Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$UserLine['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>';
-                                $Output .= ShowTabs(array(T('General'), T('Translators'), 'Překlady', T('Languages'), T('Format'), T('Version'), T('Statistic'), T('Output')));
-                                $Output .= '<div id="content">';
-                                if($_SESSION['Tab'] == TAB_GENERAL) $Output .= $this->ExportViewGeneral();
-                                else if($_SESSION['Tab'] == TAB_TRANSLATORS) $Output .= $this->ExportViewTranslators();
-                                else if($_SESSION['Tab'] == TAB_GROUPS) $Output .= $this->ExportViewGroups();
-                                else if($_SESSION['Tab'] == TAB_LANGUAGES) $Output .= $this->ExportViewLanguages();
-                                else if($_SESSION['Tab'] == TAB_OUTPUT_FORMAT) $Output .= $this->ExportViewOutputFormat();
-                                else if($_SESSION['Tab'] == TAB_VERSION) $Output .= $this->ExportViewVersion();
-                                else if($_SESSION['Tab'] == TAB_STAT) $Output .= $this->ExportViewStat();
-                                else if($_SESSION['Tab'] == TAB_OUTPUT) $Output .= $this->ExportViewOutput();
-                                else $Output .= $this->ExportViewGeneral();
-        
-                                $Output .= '</div>';
-                        } else $Output .= ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ExportClone()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
-                        {
-                                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
-                                $DbRow = $DbResult->fetch_row();
-                                if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
-                                {
-                                  $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
-                                  if($DbResult->num_rows > 0)
-                                  {
-                                    $DbRow = $DbResult->fetch_assoc();
-                                    unset($DbRow['Id']);
-                                    $DbRow['UsedCount'] = '0';
-                                    $DbRow['User'] = $this->System->User->Id;                             
-                                    $DbRow['TimeCreate'] = 'NOW()';
-                                    $DbRow['Title'] .= ' - '.T('clone');
+    }
+    $Output .= '</table>'.
+        '</form>'.
+        $PageList['Output'];
+    return($Output);
+  }
+
+  function ExportViewOutputFormat()
+  {
+    $Output = '';
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    if(array_key_exists('ExportId', $_GET))
+    {
+      $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+      if($DbRows->num_rows > 0)
+      {
+        $Export = $DbRows->fetch_assoc();
+        if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+        else $Editable = false;
+
+        if(array_key_exists('Operation', $_POST))
+          if($_POST['Operation'] == 'Save')
+          {
+            if(array_key_exists('OutputType', $_POST) and ($_POST['OutputType'] * 1 > 0))
+            {
+              $this->System->Database->query('UPDATE Export SET OutputType='.$_POST['OutputType'].' WHERE Id='.$_GET['ExportId']);
+              $Output .= ShowMessage(T('Select saved.'));
+            } 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>';
+      } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ExportViewVersion()
+  {
+    $Output = '';
+    $DisabledInput = array(false => ' disabled="disabled"', true => '');
+    $DbRows = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+    $Export = $DbRows->fetch_assoc();
+    if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->Id == $Export['User'])) $Editable = true;
+    else $Editable = false;
+
+    if(array_key_exists('Operation', $_POST))
+      if(($_POST['Operation'] == 'Save') and (array_key_exists('ClientVersion', $_POST)))
+      {
+        $this->System->Database->query('UPDATE `Export` SET `ClientVersion`='.$_POST['ClientVersion'].' WHERE `Id`='.$_GET['ExportId']);
+        $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);
+  }
+
+  function ExportViewOutput()
+  {
+    $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 if($Export['ClientVersion'] == '') $Output .= ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
+    else {
+      $DbResult = $this->System->Database->query('SELECT * FROM `ExportOutputType` WHERE `Id`='.$Export['OutputType']);
+      if($DbResult->num_rows > 0)
+      {
+        $DbResult = $this->System->Database->query('SELECT * FROM `ExportVersion` WHERE (`ExportType`='.$Export['OutputType'].') AND (`ClientVersion`='.$Export['ClientVersion'].')');
+        if($DbResult->num_rows > 0)
+        {
+          if (array_key_exists('Auto', $_GET) == false)
+            $this->System->Database->query('UPDATE `Export` SET `UsedCount` = `UsedCount` + 1 WHERE `Id`='.$Export['Id']);
+          $Output = ExportOutput($Export['Id'], $Export['OutputType']);
+        } else $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
+      } else $Output = ShowMessage(T('Format output isn\'t select').'.', MESSAGE_CRITICAL);
+    }
+    return($Output);
+  }
+
+  function ExportViewStat($Where = '')
+  {
+    $Export = new Export($this->System);
+    $Export->Id = $_GET['ExportId'];
+    $Export->Init();
+    $Export->LoadFilters();
+
+    if(($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == ''))
+      $Output = ShowMessage(T('Export don\'t have selected version of client'), MESSAGE_CRITICAL);
+    else {
+      $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
+          ' JOIN `ExportGroup` ON (`ExportGroup`.`Export`='.$Export->Id.') AND (`ExportGroup`.`Group`=`Group`.`Id`)';
+      $Query = '';
+      $UnionItems = array();
+      $DbResult = $this->System->Database->query($GroupListQuery.$Where);
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $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` = '.$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);
+
+      $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
+      $DbRow = $DbResult->fetch_row();
+      $PageList = GetPageList($DbRow[0]);
+      $Output = '<h3>'.T('Statistic of coplection selected groups').'</h3>'.
+        $PageList['Output'];
+
+      $Output .= '<table class="BaseTable">';
+      $TableColumns = array(
+        array('Name' => 'Name', 'Title' => T('Name')),
+        array('Name' => 'Translated', 'Title' => T('Translated count')),
+        array('Name' => 'Total', 'Title' => T('English')),
+        array('Name' => 'Percent', 'Title' => T('Percent')),
+      );
+
+      $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+      $Output .= $Order['Output'];
+
+      $Translated = 0;
+      $Total = 0;
+      if(count($UnionItems) > 0)
+      {
+        $ID = $this->System->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.implode(' UNION ALL ', $UnionItems).') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+        while($Group = $ID->fetch_assoc())
+        {
+          $Output .= '<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
+          $Translated += $Group['Translated'];
+          $Total += $Group['Total'];
+        }
+      }
+      if($Total > 0) $Percent = $Translated / $Total * 100;
+      else $Percent = 100;
+
+      $Output .= '<tr><td><strong>'.T('Altogether').'</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, round($Percent, 2)).'</strong></td></tr>';
+      $Output .= '</table>';
+    }
+    return($Output);
+  }
+
+  function ExportView()
+  {
+    $Output = '';
+    if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
+    {
+      $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+      if($DbResult->num_rows > 0)
+      {
+        $Export = $DbResult->fetch_assoc();
+
+        $DbResult = $this->System->Database->query('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
+        $UserLine = $DbResult->fetch_assoc();
+        $Output .= 'Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$UserLine['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>';
+        $Output .= ShowTabs(array(T('General'), T('Translators'), 'Překlady', T('Languages'), T('Format'), T('Version'), T('Statistic'), T('Output')));
+        $Output .= '<div id="content">';
+        if($_SESSION['Tab'] == TAB_GENERAL) $Output .= $this->ExportViewGeneral();
+        else if($_SESSION['Tab'] == TAB_TRANSLATORS) $Output .= $this->ExportViewTranslators();
+        else if($_SESSION['Tab'] == TAB_GROUPS) $Output .= $this->ExportViewGroups();
+        else if($_SESSION['Tab'] == TAB_LANGUAGES) $Output .= $this->ExportViewLanguages();
+        else if($_SESSION['Tab'] == TAB_OUTPUT_FORMAT) $Output .= $this->ExportViewOutputFormat();
+        else if($_SESSION['Tab'] == TAB_VERSION) $Output .= $this->ExportViewVersion();
+        else if($_SESSION['Tab'] == TAB_STAT) $Output .= $this->ExportViewStat();
+        else if($_SESSION['Tab'] == TAB_OUTPUT) $Output .= $this->ExportViewOutput();
+        else $Output .= $this->ExportViewGeneral();
+
+        $Output .= '</div>';
+      } else $Output .= ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Is isn\'t select'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ExportClone()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('ExportId', $_GET) and is_numeric($_GET['ExportId']))
+      {
+        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` WHERE `User`='.$this->System->User->Id);
+        $DbRow = $DbResult->fetch_row();
+        if($DbRow[0] < $this->System->Config['MaxExportPerUser'])
+        {
+          $DbResult = $this->System->Database->query('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId']);
+          if($DbResult->num_rows > 0)
+          {
+            $DbRow = $DbResult->fetch_assoc();
+            unset($DbRow['Id']);
+            $DbRow['UsedCount'] = '0';
+            $DbRow['User'] = $this->System->User->Id;
+            $DbRow['TimeCreate'] = 'NOW()';
+            $DbRow['Title'] .= ' - '.T('clone');
             $DbRow['Featured'] = 0;
-                                          $this->System->Database->insert('Export', $DbRow);
-                                    $ExportId = $this->System->Database->insert_id;                                     
-                                    $this->System->Database->query('INSERT INTO `ExportGroup` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `Group` FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId'].')');
-                                    $this->System->Database->query('INSERT INTO `ExportGroupItem` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `GroupItem` FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId'].')');
-                                    $this->System->Database->query('INSERT INTO `ExportLanguage` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `Language`, `Sequence` FROM `ExportLanguage` WHERE `Export`='.$_GET['ExportId'].')');
-                                    $this->System->Database->query('INSERT INTO `ExportUser` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `User`, `Sequence` FROM `ExportUser` WHERE `Export`='.$_GET['ExportId'].')');
-                                          $Output = ShowMessage(T('Clone export created.<br />Direct link to export').': <a href="?Action=View&amp;ExportId='.$ExportId.'">zde</a>');
-                                          $this->System->ModuleManager->Modules['Log']->WriteLog(T('Clone export created').' <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">'.$ExportId.'</a>.', LOG_TYPE_EXPORT);
-                                          $_GET['Filter'] = 'my';
-                                          $this->ExportList();
-                                        } else $Output = ShowMessage('Zdrojový export nenalezen', MESSAGE_CRITICAL);
-                                } else $Output = ShowMessage('Nemůžete vytvářet další export. Max. počet na uživatele je '.
-                                        $this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
-                        } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function Show()
-  {
-        $this->Title = T('Export');
+            $this->System->Database->insert('Export', $DbRow);
+            $ExportId = $this->System->Database->insert_id;
+            $this->System->Database->query('INSERT INTO `ExportGroup` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `Group` FROM `ExportGroup` WHERE `Export`='.$_GET['ExportId'].')');
+            $this->System->Database->query('INSERT INTO `ExportGroupItem` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `GroupItem` FROM `ExportGroupItem` WHERE `Export`='.$_GET['ExportId'].')');
+            $this->System->Database->query('INSERT INTO `ExportLanguage` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `Language`, `Sequence` FROM `ExportLanguage` WHERE `Export`='.$_GET['ExportId'].')');
+            $this->System->Database->query('INSERT INTO `ExportUser` (SELECT NULL AS `Id`, '.$ExportId.' AS `Export`, `User`, `Sequence` FROM `ExportUser` WHERE `Export`='.$_GET['ExportId'].')');
+            $Output = ShowMessage(T('Clone export created.<br />Direct link to export').': <a href="?Action=View&amp;ExportId='.$ExportId.'">zde</a>');
+            $this->System->ModuleManager->Modules['Log']->WriteLog(T('Clone export created').' <a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$ExportId).'">'.$ExportId.'</a>.', LOG_TYPE_EXPORT);
+            $_GET['Filter'] = 'my';
+            $this->ExportList();
+          } else $Output = ShowMessage('Zdrojový export nenalezen', MESSAGE_CRITICAL);
+        } else $Output = ShowMessage('Nemůžete vytvářet další export. Max. počet na uživatele je '.
+          $this->System->Config['MaxExportPerUser'].'.', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage(T('Export not found.'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function Show()
+  {
+    $this->Title = T('Export');
     if(array_key_exists('Action', $_GET))
     {
@@ -820 +820 @@
     } else $Output = $this->ExportList();
     return($Output);
-  } 
+  }
 }

trunk/Modules/Export/ProcessAoWoWExport.php

@@ -5 +5 @@
 include_once('../../includes/global.php');
 //include_once('../../includes/dbc.php');
-include_once('Export.php');    
-include_once('Page.php');    
+include_once('Export.php');
+include_once('Page.php');
 
   $System = new System();
   $System->DoNotShowPage = true;
-        $System->Run();
+    $System->Run();
 
 $Output = '';
 
-if(defined('STDIN') == false) 
+if(defined('STDIN') == false)
 {
   $Output = T('Access denied');
   exit($Output);
-} 
+}
 
 foreach($_SERVER['argv'] as $parameter)
@@ -36 +36 @@
   $Export->Id = $Config['AoWoWExportId'];
 } else $Export->Id = 37;
-  $Output .= $Export->Init();                   
+  $Output .= $Export->Init();
   $SQL = $Export->ExportToAoWoWSQL();
 echo 'Hotovo
@@ -89 +89 @@
 }
 $Files = scandir(dirname(__FILE__).'/../../aowow/cache/templates/wowhead');
-foreach($Files as $File) 
+foreach($Files as $File)
 {
   $End = substr($File, strlen($File) - 3);

trunk/Modules/Export/ProcessTask.php

@@ -12 +12 @@
   $System = new System();
   $System->DoNotShowPage = true;
-        $System->Run();
+    $System->Run();
 
 function SetProgress($Export,$per) {

trunk/Modules/Export/Progress.php

@@ -2 +2 @@
 
 include_once(dirname(__FILE__).'/../../includes/global.php');
-  
+
   $System = new System();
   $System->DoNotShowPage = true;
   $System->Run();
-    
+
 
     $Output = '';
@@ -12 +12 @@
     ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE  (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL  OR `Export` ='.$_GET['RedirectId'].' ORDER BY `Progress` DESC');// `Export`='.$Export->Id
     while($Task = $DbResult->fetch_assoc()) {
-      $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';         
+      $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
       if ($_GET['RedirectId'] == $Task['Export'])
         $Export = ''.$Export.' (tento)';
@@ -19 +19 @@
       'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['RedirectId']).'\'", 500)'.
       '</script>';
-    }    
+    }
 
     echo $Output;

trunk/Modules/Export/cmdmpqexport.php

@@ -5 +5 @@
 include_once(dirname(__FILE__).'/../../includes/global.php');
 //include_once('../../includes/dbc.php');
-include_once('Export.php');    
-include_once('Page.php');    
+include_once('Export.php');
+include_once('Page.php');
 
   $System = new System();
   $System->DoNotShowPage = true;
-        $System->Run();
+    $System->Run();
 $PageExport = new PageExport($System);
 
@@ -17 +17 @@
 $Output = '';
 
-if(defined('STDIN') == false) 
+if(defined('STDIN') == false)
 {
   $Output = T('Access denied');
   exit($Output);
-} 
+}
 
 foreach($_SERVER['argv'] as $parameter)
@@ -37 +37 @@
   $Output .= 'Usage ExportId=id_export - for write export info<br />';
   $Output .= 'Usage needgeneration=id_export - for write export info<br />';
-  
+
   $Output .= 'type_export={lua,dbc,addon} <br />';
   $Output = str_replace('<br />','
@@ -46 +46 @@
   $Export = new Export($System);
   $Export->Id = $_GET['lua'];
-  $Output .= $Export->Init();                   
+  $Output .= $Export->Init();
   $Output .= $Export->ExportToLua();
   $Output = str_replace('<br/>','
@@ -56 +56 @@
   $Export = new Export($System);
   $Export->Id = $_GET['version'];
-  $Export->LoadFilters();   
+  $Export->LoadFilters();
   $Output .= $Export->ClientVersion['Version'];
   $Output = str_replace('<br/>','
@@ -66 +66 @@
   $Export = new Export($System);
   $Export->Id = $_GET['dbc'];
-  $Output .= $Export->Init();                   
+  $Output .= $Export->Init();
   $Output .= $Export->ExportToDbc();
   $Output = str_replace('<br/>','
@@ -85 +85 @@
 
 if(array_key_exists('needgeneration', $_GET)) {
-        $DbRows = $System->Database->query('SELECT `ClientVersion`.`Version` as Version, `Export`.`Id`,`Export`.`ClientVersion`,`Export`.`OutputType`,`Export`.`Title`,`Export`.`Description` FROM `Export` JOIN `ClientVersion` as `ClientVersion` ON `ClientVersion`.`Id`=`Export`.`ClientVersion` WHERE `Featured`=1 ORDER BY `ClientVersion`.`BuildNumber` DESC');
+  $DbRows = $System->Database->query('SELECT `ClientVersion`.`Version` as Version, `Export`.`Id`,`Export`.`ClientVersion`,`Export`.`OutputType`,`Export`.`Title`,`Export`.`Description` FROM `Export` JOIN `ClientVersion` as `ClientVersion` ON `ClientVersion`.`Id`=`Export`.`ClientVersion` WHERE `Featured`=1 ORDER BY `ClientVersion`.`BuildNumber` DESC');
   while ($DbExport = $DbRows->fetch_assoc()) {
   $Export = new Export($System);
   $Export->Id = $DbExport['Id'];
-  $Output .= $Export->Init();                   
+  $Output .= $Export->Init();
   if ($Export->NeedGeneration()) {
     $DbResult = $System->Database->query('SELECT * FROM ExportTask WHERE Export = '.$Export->Id);
@@ -95 +95 @@
     {
       $System->Database->query('INSERT INTO ExportTask (`Export` ,`TimeStart` ) VALUES ('.$Export->Id.', NOW())');
-    } else  
+    } else
       $System->Database->query('UPDATE ExportTask SET `TimeStart` = NOW(), `Progress` = 0, `TimeFinish` = NULL WHERE Export = '.$Export->Id);
 
@@ -113 +113 @@
   $Export = new Export($System);
   $Export->Id = $_GET['ExportId'];
-  $Export->LoadFilters();  
-  
+  $Export->LoadFilters();
+
   //generation readme
   $Output .= '<?xml version="1.0" encoding="utf-8"?\>'.
@@ -129 +129 @@
   '<meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />'.
   '<title>Čeština pro WoW</title>'.
-'</head><body>'. 
+'</head><body>'.
 '<h1>České WoW - čestina pro klienta hry World of Warcraft</h1>'.
- 
+
 '<table cellspacing="10"><tr><td valign="top">'.
- 
+
 '<p>Texty přebírány z projektu <a href="http://wowpreklad.zdechov.net/">wowpreklad.zdechov.net</a><br>'.
 '<a href="http://wowpreklad.zdechov.net/export/?Action=View&ExportId='.$_GET['ExportId'].'&Tab=0">Export '.$_GET['ExportId'].'</a></p><br>'.
- 
- 
+
+
 '<p><strong>Vlastnosti</strong>'.
 '<ul>'.
@@ -148 +148 @@
 '</p>'.
 '<br>'.
- 
+
 '<h2>Nejčastější otázky</h2>'.
 '<p><strong>Jak mám hru spustit?</strong><br>'.
@@ -155 +155 @@
 '<p><strong>Mohu použít tuto češtinu na oficiálních serverech?</strong><br>'.
 'Ne úplně, protože se vystavujete riziku zablokování vašeho účtu z důvodu použití upravené hry. Na oficiálním serveru lze využít pouze Addon s češtinou CzWoW.</p>'.
- 
+
 '<p><strong>Mám nainstalovánu češtinu a nejde mi spustit Wow.exe.</strong><br>'.
 'Pokud chcete opět spouštět hru přes původní Wow.exe v angličtině, musíte češtinu nejprve odinstalovat ze systému. Především se jedná o soubor Data/enGB/patch-enGB-5.MPQ či Data/enUS/patch-enUS-5.MPQ, který je nutno smazat.</p>'.
- 
+
 '<p><strong>Nedaří se mi provést aktualizaci klienta s nainstalovanou češtinou.</strong><br>'.
 'Před aktualizací na novější verzi klienta musíte nejprve češtinu odinstalovat. Čeština totiž mění v rámci patch MPQ souboru některé soubory hry, což oficiální instalátory vyhodnotí jako poškození hry.</p>'.
-  
+
 '</td><td>';
 
@@ -167 +167 @@
 
   $Output .= '</td></tr></table>'.
- 
- 
+
+
   '</body></html>';
-  
+
 }
 //$_GET['ExportId']

trunk/Modules/Forum/Forum.php

@@ -3 +3 @@
 class ModuleForum extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'Forum';
-                $this->Version = '1.0';
-                $this->Creator = 'Maron';
-                $this->License = 'GNU/GPL';
-                $this->Description = '';
-                $this->Dependencies = array();
-        }
-
-        function Start()
-        {
-                $this->System->RegisterPage('forum', 'PageForum');
-        $this->System->ModuleManager->Modules['News']->RegisterRSS(array(
-          'Title' => T('Forum'), 'Channel' => 'forum', 'Callback' => array('PageForum', 'ShowRSS'), 
-          'Permission' => LICENCE_ANONYMOUS));           
-    
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Forum';
+    $this->Version = '1.0';
+    $this->Creator = 'Maron';
+    $this->License = 'GNU/GPL';
+    $this->Description = '';
+    $this->Dependencies = array();
+  }
+
+  function Start()
+  {
+    $this->System->RegisterPage('forum', 'PageForum');
+    $this->System->ModuleManager->Modules['News']->RegisterRSS(array(
+      'Title' => T('Forum'), 'Channel' => 'forum', 'Callback' => array('PageForum', 'ShowRSS'),
+      'Permission' => LICENCE_ANONYMOUS));
+
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('forum',
@@ -27 +27 @@
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('forumthread',
       T('Name of thread forum'), array('UserName', 'Text'), '`ForumThread`', $this->System->Link('/forum/?search='));
-                
+
     $this->System->RegisterMenuItem(array(
       'Title' => T('Forum'),
@@ -35 +35 @@
       'Icon' => '',
     ), 17);
-        }
+  }
 }
 
 class PageForum extends Page
 {
-        function Show()
-        {
-    $Output = '';
-                $this->Title = T('Forum');
-                if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-          else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+  function Show()
+  {
+    $Output = '';
+    $this->Title = T('Forum');
+    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
            else $Action = '';
     if (array_key_exists('Edit', $_GET)) {
-      if (array_key_exists('text', $_POST)) 
-        $Output .= $this->Edit();      
+      if (array_key_exists('text', $_POST))
+        $Output .= $this->Edit();
       $Output .= $this->ShowEditForm();
-      
+
     } else
     if (array_key_exists('search', $_GET))
@@ -57 +57 @@
     else
     if (array_key_exists('Thread', $_GET)) {
-                $Output .= '<h3>'.T('Forum - Thread').'</h3>';
-                  if($Action == 'add2') $Output .= $this->AddFinish();
-                  if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddForm();
-                  $Output .= $this->ShowList();
+      $Output .= '<h3>'.T('Forum - Thread').'</h3>';
+      if($Action == 'add2') $Output .= $this->AddFinish();
+      if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddForm();
+      $Output .= $this->ShowList();
     } else {
-                $Output .= '<h3>'.T('Forum - List of Thread').'</h3>';
-                  if($Action == 'add2') $Output .= $this->AddFinish('ForumThread');
-                  if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddFormThread();
+      $Output .= '<h3>'.T('Forum - List of Thread').'</h3>';
+      if($Action == 'add2') $Output .= $this->AddFinish('ForumThread');
+      if($this->System->User->Licence(LICENCE_USER)) $Output .= $this->ShowAddFormThread();
       $Output .= $this->ShowListThread();
     }
-                return($Output);
-        }
-  
-  function Edit() 
-  {
-    $Output = '';
-
-                $Text = $_POST['text'];
-
-                $DbResult = $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
-    
+    return($Output);
+  }
+
+  function Edit()
+  {
+    $Output = '';
+
+    $Text = $_POST['text'];
+
+    $DbResult = $this->System->Database->query('UPDATE `ForumText` SET `Text`="'.$_POST['text'].'" WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
+
     $Output .= ShowMessage(T('Text edited.'));
 
-        
+
     return ($Output);
   }
-        
-        function ShowEditForm()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-        $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
+
+  function ShowEditForm()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `User` = '.$this->System->User->Id.' AND `ID` = '.$_GET['Edit']);
       if ( $DbResult->num_rows > 0) {
         $DbRow = $DbResult->fetch_assoc();
-                                $Output .= '<form action="?Edit='.$_GET['Edit'].'" method="post">'.
-                                                '<fieldset><legend>'.T('Edit message').'</legend>'.
-                                                T('User').': ';
-                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
-                                else $Output .= '<input type="text" name="user" /><br />';
-                        $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.                         
-                        '<textarea onkeydown="ResizeTextArea(this)" rows="8" name="text" cols="80">'.$DbRow['Text'].'</textarea> <br/>'.
-                        '<input type="hidden" name="a" value="add2"/>'.
-                          '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
-                          '</form>';
-                  }     else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-    }   else $Output .= ShowMessage(T('You can edit only your own message.'), MESSAGE_CRITICAL);
-          return($Output);      
-        }
-
-        function ShowSearchForum()
+        $Output .= '<form action="?Edit='.$_GET['Edit'].'" method="post">'.
+            '<fieldset><legend>'.T('Edit message').'</legend>'.
+            T('User').': ';
+        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        else $Output .= '<input type="text" name="user" /><br />';
+        $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
+        '<textarea onkeydown="ResizeTextArea(this)" rows="8" name="text" cols="80">'.$DbRow['Text'].'</textarea> <br/>'.
+        '<input type="hidden" name="a" value="add2"/>'.
+        '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
+        '</form>';
+      } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
+    }   else $Output .= ShowMessage(T('You can edit only your own message.'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowSearchForum()
   {
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-        $Count = 20;
-        $Output = '';
-  
-                $Output .= '<div class="shoutbox">';
+    $Count = 20;
+    $Output = '';
+
+    $Output .= '<div class="shoutbox">';
     $where = '`ForumText`.`Text` LIKE "%'.($_GET['search'] ).'%" OR '.
     ' `ForumThread`.`Text` LIKE "%'.($_GET['search'] ).'%" OR `ForumThread`.`UserName` LIKE "%'.($_GET['search'] ).'%" OR '.
@@ -119 +119 @@
     $join = ' JOIN `ForumThread` ON `ForumThread`.`ID` = `ForumText`.`Thread`';
 
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` '.$join.' WHERE '.$where);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);     
-
-                $Output .= $PageList['Output'];
-
-                $DbResult = $this->System->Database->query('SELECT `ForumText`.`Text`, `ForumText`.`Date`, `ForumText`.`UserName`,'.
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` '.$join.' WHERE '.$where);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'];
+
+    $DbResult = $this->System->Database->query('SELECT `ForumText`.`Text`, `ForumText`.`Date`, `ForumText`.`UserName`,'.
     '`ForumThread`.`Text` as `ThreadName`,`ForumText`.`Thread` FROM `ForumText` '.$join.' WHERE '.$where.' ORDER BY `ForumText`.`Date` DESC '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc())
-                        $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.$Line['ThreadName'].'</a><br /><strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse($Line['Text']).'</div> ';
-                $Output .= '</div>'.$PageList['Output'];
-                return($Output);
-  }
-
-        function ShowListThread()
-        {
-                $Output = '';
-
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumThread` WHERE 1');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);     
-
-                $Output .= $PageList['Output'];
-                $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE 1 ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc())
-                        $Output .= '<div><span style="float:right;"><strong>'.$Line['UserName'].'</strong> - ('.HumanDate($Line['Date']).')</span> <a href="?Thread='.$Line['ID'].'">'.str_replace("\n", '',$Line['Text']).'</a> </div>';
-                $Output .= '</div>'.$PageList['Output'];
-                return($Output);
-        }
-        
-        function ShowList()
-        {
-                $Output = '';
-    
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.$Line['ThreadName'].'</a><br /><strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse($Line['Text']).'</div> ';
+    $Output .= '</div>'.$PageList['Output'];
+    return($Output);
+  }
+
+  function ShowListThread()
+  {
+    $Output = '';
+
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumThread` WHERE 1');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'];
+    $Output .= '<div class="shoutbox">';
+    $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE 1 ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<div><span style="float:right;"><strong>'.$Line['UserName'].'</strong> - ('.HumanDate($Line['Date']).')</span> <a href="?Thread='.$Line['ID'].'">'.str_replace("\n", '',$Line['Text']).'</a> </div>';
+    $Output .= '</div>'.$PageList['Output'];
+    return($Output);
+  }
+
+  function ShowList()
+  {
+    $Output = '';
+
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-  //  echo $parser->qparse('[youtube]http://www.youtube.com/watch?v=hwgO6p2Jh-A[/youtube][img]http://www.bbcode.org/images/lubeck_small.jpg[/img]normal [i][b]bold[/b][/i] [img]http://imageshack.com/a/img203/7462/6ctg.jpg[/img]  and normal again'); 
-    
-                if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-                if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-                if($_SESSION['search'] != '')
-                {
-                        $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
-                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
-                } else $SearchQuery = '';                       
-
-                $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
-                if($DbResult->num_rows > 0)
-                {
-                $Thread = $DbResult->fetch_assoc();
+  //  echo $parser->qparse('[youtube]http://www.youtube.com/watch?v=hwgO6p2Jh-A[/youtube][img]http://www.bbcode.org/images/lubeck_small.jpg[/img]normal [i][b]bold[/b][/i] [img]http://imageshack.com/a/img203/7462/6ctg.jpg[/img]  and normal again');
+
+    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if($_SESSION['search'] != '')
+    {
+      $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
+      $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+    } else $SearchQuery = '';
+
+    $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
+    if($DbResult->num_rows > 0)
+    {
+    $Thread = $DbResult->fetch_assoc();
     $Output .= '<h3>'.$Thread['Text'].'</h3>';
 
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` WHERE `Thread` = '.($_GET['Thread']*1).' '.$SearchQuery);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);     
-
-                $Output .= $PageList['Output'];
-                $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `Thread` = '.
-                  ($_GET['Thread']*1).' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc()) {
-                        if ($this->System->User->Id == $Line['User'])
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ForumText` WHERE `Thread` = '.($_GET['Thread']*1).' '.$SearchQuery);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'];
+    $Output .= '<div class="shoutbox">';
+    $DbResult = $this->System->Database->query('SELECT * FROM `ForumText`  WHERE `Thread` = '.
+      ($_GET['Thread']*1).' '.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+    while($Line = $DbResult->fetch_assoc()) {
+      if ($this->System->User->Id == $Line['User'])
         $edit = '<a href="?Edit='.$Line['ID'].'">editovat</a>';
       else $edit = '';
@@ -187 +187 @@
         ')</span><strong>'.$Line['UserName'].'</strong>: '.str_replace("\n", '<br />',$parser->qparse($Line['Text'])).'  </div> ';
     }
-                $Output .= '</div>'.$PageList['Output'];
-                } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ShowAddForm()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                                $Output .= '<form action="?Thread='.$_GET['Thread'].'" method="post">'.
-                                                '<fieldset><legend>'.T('New Forum Message').'</legend>'.
-                                                'Uživatel: ';
-                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
-                                else $Output .= '<input type="text" name="user" /><br />';
-                        $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.                         
-                        '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="80"></textarea> <br/>'.
-                        '<input type="hidden" name="a" value="add2"/>'.
-                        '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
-                        '</form>';
-                }       else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-          return($Output);      
-        }
-  
-        function ShowAddFormThread()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                                $Output .= '<form action="?" method="post">'.
-                                                '<fieldset><legend>'.T('New thread').'</legend>'.
-                                                'Uživatel: ';
-                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
-                                else $Output .= '<input type="text" name="user" /><br />';
-                        $Output .= T('Name of thread').': <br />'.
-                        '<textarea onkeydown="ResizeTextArea(this)" name="text" rows="1" cols="30"></textarea> <br/>'.
-                        '<input type="hidden" name="a" value="add2"/>'.
-                        '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
-                        '</form>';
-                }       else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-          return($Output);      
-        }
-        
-        function AddFinish($Table = 'ForumText')
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('text', $_POST))
-                        {
-                                $Text = $_POST['text'];
-                                if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
-                                else
-                                {
-                                        // Protection against mutiple post of same message
+    $Output .= '</div>'.$PageList['Output'];
+    } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowAddForm()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+        $Output .= '<form action="?Thread='.$_GET['Thread'].'" method="post">'.
+            '<fieldset><legend>'.T('New Forum Message').'</legend>'.
+            'Uživatel: ';
+        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        else $Output .= '<input type="text" name="user" /><br />';
+        $Output .= T('Message text').': ('.T('You can use').' <a href="http://www.bbcode.org/reference.php">'.T('BB code').'</a>)<br/>'.
+      '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="80"></textarea> <br/>'.
+      '<input type="hidden" name="a" value="add2"/>'.
+      '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
+      '</form>';
+    } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowAddFormThread()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+        $Output .= '<form action="?" method="post">'.
+            '<fieldset><legend>'.T('New thread').'</legend>'.
+            'Uživatel: ';
+        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        else $Output .= '<input type="text" name="user" /><br />';
+      $Output .= T('Name of thread').': <br />'.
+      '<textarea onkeydown="ResizeTextArea(this)" name="text" rows="1" cols="30"></textarea> <br/>'.
+      '<input type="hidden" name="a" value="add2"/>'.
+      '<input type="submit" value="'.T('Send').'" /><br /></fieldset>'.
+      '</form>';
+    } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function AddFinish($Table = 'ForumText')
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('text', $_POST))
+      {
+        $Text = $_POST['text'];
+        if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
+        else
+        {
+          // Protection against mutiple post of same message
           $Thread = '';
-          if ($Table == 'ForumText') $Thread = 'AND `Thread` = '.$_GET['Thread']; 
-                                        $DbResult = $this->System->Database->query('SELECT `Text` FROM `'.$Table.'` WHERE 1 '.$Thread.' AND (`User` = "'.          
-                                                        $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
-                                        if($DbResult->num_rows > 0)
-                                        {
-                                                $DbRow = $DbResult->fetch_assoc();
-                                        } else $DbRow['Text'] = '';
-                        
-                                        if($DbRow['Text'] == $Text) $Output .= ShowMessage(T('You can\' add same message twice.'), MESSAGE_WARNING);
-                                        else
-                                        {
-                                                if ($Table == 'ForumText') {
-
-                        $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
-                          if($DbResult->num_rows > 0)
-                          {
+          if ($Table == 'ForumText') $Thread = 'AND `Thread` = '.$_GET['Thread'];
+          $DbResult = $this->System->Database->query('SELECT `Text` FROM `'.$Table.'` WHERE 1 '.$Thread.' AND (`User` = "'.
+              $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
+          if($DbResult->num_rows > 0)
+          {
+            $DbRow = $DbResult->fetch_assoc();
+          } else $DbRow['Text'] = '';
+
+          if($DbRow['Text'] == $Text) $Output .= ShowMessage(T('You can\' add same message twice.'), MESSAGE_WARNING);
+          else
+          {
+            if ($Table == 'ForumText') {
+
+              $DbResult = $this->System->Database->query('SELECT * FROM `ForumThread` WHERE ID='.($_GET['Thread']*1).' LIMIT 1');
+              if($DbResult->num_rows > 0)
+              {
                 $this->System->Database->query('INSERT INTO `'.$Table.'` ( `User`, `UserName` , `Text` , `Date` , `IP` , `Thread` ) '.
-                                                                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
-                                                                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'","'.$_GET['Thread'].'")');
+                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
+                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'","'.$_GET['Thread'].'")');
               } else $Output .= ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
              } else
             $this->System->Database->query('INSERT INTO `'.$Table.'` ( `User`, `UserName` , `Text` , `Date` , `IP`) '.
-                                                                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
-                                                                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'")');
-                                                $Output .= ShowMessage(T('Added.'));
-                                        }
-                                }
-                        } else $Output .= ShowMessage(T('You have to specified new message.'), MESSAGE_CRITICAL);                               
-                        $Output .= '<br/>';
-                } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
-                return($Output);
-        }       
-        
-        function ShowRSS()
-        {
+                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
+                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'")');
+            $Output .= ShowMessage(T('Added.'));
+          }
+        }
+      } else $Output .= ShowMessage(T('You have to specified new message.'), MESSAGE_CRITICAL);
+      $Output .= '<br/>';
+    } else $Output .= ShowMessage(T('You have to be registered for adding message.'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowRSS()
+  {
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
 
     $Items = array();
-          $TitleLength = 50;
-          mb_internal_encoding('utf-8');
-          $DbResult = $this->Database->query('SELECT `Thread`, `ID`, UNIX_TIMESTAMP(`Date`) AS `UnixDate`, '.
+    $TitleLength = 50;
+    mb_internal_encoding('utf-8');
+    $DbResult = $this->Database->query('SELECT `Thread`, `ID`, UNIX_TIMESTAMP(`Date`) AS `UnixDate`, '.
       '`User`, `UserName`, `Text`, ( SELECT `Text` FROM `ForumThread` '.
       'WHERE `ID` = `ForumText`.`Thread`) AS `ThreadText` FROM `ForumText` ORDER BY `ID` DESC LIMIT 20');
-          while($DbRow = $DbResult->fetch_assoc())
-          {
-            $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
-            if(mb_strlen($Title) == $TitleLength) $Title .= '...';
-            $Items[] = array
-            (
-              'Title' =>  $DbRow['ThreadText'].' - '.$DbRow['UserName'].': ',
-              'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/?Thread='.$DbRow['Thread']),
-              'Description' => $parser->qparse($DbRow['Text']),
-              'Time' => $DbRow['UnixDate'],
-            );
-          }
-          $Output = GenerateRSS(array
-          (
-            'Title' => $this->System->Config['Web']['Title'].' - '.T('Forum'),
-            'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/'),
-            'Description' => $this->System->Config['Web']['Description'],
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
+      if(mb_strlen($Title) == $TitleLength) $Title .= '...';
+      $Items[] = array
+      (
+        'Title' =>  $DbRow['ThreadText'].' - '.$DbRow['UserName'].': ',
+        'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/?Thread='.$DbRow['Thread']),
+        'Description' => $parser->qparse($DbRow['Text']),
+        'Time' => $DbRow['UnixDate'],
+      );
+    }
+    $Output = GenerateRSS(array
+    (
+      'Title' => $this->System->Config['Web']['Title'].' - '.T('Forum'),
+      'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/forum/'),
+      'Description' => $this->System->Config['Web']['Description'],
       'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
       'Items' => $Items,
     ));
     return($Output);
-        }
+  }
 }

trunk/Modules/FrontPage/FrontPage.php

@@ -28 +28 @@
   function HandleLoginForm()
   {
-        global $Message, $MessageType;
+    global $Message, $MessageType;
 
-        if(array_key_exists('action', $_GET))
-        {
-                if($_GET['action'] == 'login')
-                {
-                        if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
-                        {
-                                if(array_key_exists('StayLogged', $_POST)) $StayLogged = true;
-                                  else $StayLogged = false;
-                                $this->System->User->Login($_POST['LoginUser'], $_POST['LoginPass'], $StayLogged);
-                                if($this->System->User->Role == LICENCE_ANONYMOUS)
-                                {
-                                        $Message = T('Incorrect name or password');
-                                        $MessageType = MESSAGE_CRITICAL;
-                                } else
-                                {
-                                        $Message = sprintf(T('Login successful. Welcome <strong>%s</strong>!'), $this->System->User->Name);
-                                        $MessageType = MESSAGE_INFORMATION;
-                                }
-                        } else
-                        {
-                                $Message = T('User name or password was not entered');
-                                $MessageType = MESSAGE_CRITICAL;
-                        }
-                } else
-                        if($_GET['action'] == 'logout')
-                        {
-                                if($this->System->User->Role != LICENCE_ANONYMOUS)
-                                {
-                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Odhlášení', LOG_TYPE_USER);
-                                        $this->System->User->Logout();
-                                        $Message = T('You were logged out');
-                                        $MessageType = MESSAGE_INFORMATION;
-                                }
-                        }
-        }
+    if(array_key_exists('action', $_GET))
+    {
+      if($_GET['action'] == 'login')
+      {
+        if(array_key_exists('LoginUser', $_POST) and array_key_exists('LoginPass', $_POST))
+        {
+          if(array_key_exists('StayLogged', $_POST)) $StayLogged = true;
+            else $StayLogged = false;
+          $this->System->User->Login($_POST['LoginUser'], $_POST['LoginPass'], $StayLogged);
+          if($this->System->User->Role == LICENCE_ANONYMOUS)
+          {
+            $Message = T('Incorrect name or password');
+            $MessageType = MESSAGE_CRITICAL;
+          } else
+          {
+            $Message = sprintf(T('Login successful. Welcome <strong>%s</strong>!'), $this->System->User->Name);
+            $MessageType = MESSAGE_INFORMATION;
+          }
+        } else
+        {
+          $Message = T('User name or password was not entered');
+          $MessageType = MESSAGE_CRITICAL;
+        }
+      } else
+        if($_GET['action'] == 'logout')
+        {
+          if($this->System->User->Role != LICENCE_ANONYMOUS)
+          {
+            $this->System->ModuleManager->Modules['Log']->WriteLog('Odhlášení', LOG_TYPE_USER);
+            $this->System->User->Logout();
+            $Message = T('You were logged out');
+            $MessageType = MESSAGE_INFORMATION;
+          }
+        }
+    }
   }
 }
@@ -72 +72 @@
   function Show()
   {
-        global $Message, $MessageType;
+    global $Message, $MessageType;
 
-        $this->Title = T('Home');
-        $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
-        $Output = '';
-        if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+    $this->Title = T('Home');
+    $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
+    $Output = '';
+    if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
 
-        $Output .= '<br />'.
-                '<table class="Home"><tr><td colspan="3">'.$this->ShowWelcome().
-                '</td></tr>';
+    $Output .= '<br />'.
+      '<table class="Home"><tr><td colspan="3">'.$this->ShowWelcome().
+      '</td></tr>';
     $Output .= '<tr><td colspan="3"><h3><a href="'.$this->System->Link('/download/').'">'.T('Download Czech File').'</a></h3></td></tr>';
 
-        $Output .= '<tr><td class="SideBox">'.$this->ShowLastTranslated().'</td>'.
-                        '<td class="news-box">'.$this->System->ModuleManager->Modules['News']->ShowBox().'</td>'.
-                        '<td class="SideBox">'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
-                        '</tr></table>';
-         return($Output);
+    $Output .= '<tr><td class="SideBox">'.$this->ShowLastTranslated().'</td>'.
+        '<td class="news-box">'.$this->System->ModuleManager->Modules['News']->ShowBox().'</td>'.
+        '<td class="SideBox">'.$this->System->ModuleManager->Modules['ShoutBox']->ShowBox().'</td>'.
+        '</tr></table>';
+     return($Output);
   }
 
   function ShowLastTranslated()
   {
-        $Count = 40;
-        $Output = '<strong>'.T('Last translated').':</strong>';
+    $Count = 40;
+    $Output = '<strong>'.T('Last translated').':</strong>';
 
-        $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
-        $Query = '';
-        $UnionItems = array();
-        $DbResult = $this->Database->query($GroupListQuery);
-        if($DbResult->num_rows > 0)
-        {
-                while($DbRow = $DbResult->fetch_assoc())
-                {
-                        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
-                                        'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
-                                        $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
-                                        $DbRow['TablePrefix'].'` AS `T`'.
-                                        ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
-                                        $Count.') AS `T`';
-                }
-                $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
-                                ' FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
-                                ' JOIN `User` ON `User`.`Id` = `TT`.`User`'.
-                                ' ORDER BY `ModifyTime` DESC LIMIT '.$Count;
-                $DbResult = $this->Database->query($Query);
-                $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('Who').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
-                while($DbRow = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
-                                        '<td><a href="user.php?user='.$DbRow['UserId'].'">'.$DbRow['UserName'].'</a></td>'.
-                                        '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
-                                        '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
-                                        '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';
-                }
-                $Output .= '</table>';
-        }
-        return($Output);
+    $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
+    $Query = '';
+    $UnionItems = array();
+    $DbResult = $this->Database->query($GroupListQuery);
+    if($DbResult->num_rows > 0)
+    {
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
+            'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
+            $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
+            $DbRow['TablePrefix'].'` AS `T`'.
+            ' WHERE (`T`.`Complete` = 1) AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+            $Count.') AS `T`';
+      }
+      $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
+          ' FROM ('.implode(' UNION ', $UnionItems).') AS `TT`'.
+          ' JOIN `User` ON `User`.`Id` = `TT`.`User`'.
+          ' ORDER BY `ModifyTime` DESC LIMIT '.$Count;
+      $DbResult = $this->Database->query($Query);
+      $Output .= '<table class="MiniTable"><tr><th>'.T('Date').'</th><th>'.T('Who').'</th><th>'.T('New').'</th><th>'.T('Source').'</th><th>'.T('Group').'</th></tr>';
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
+            '<td><a href="user.php?user='.$DbRow['UserId'].'">'.$DbRow['UserName'].'</a></td>'.
+            '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
+            '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
+            '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';
+      }
+      $Output .= '</table>';
+    }
+    return($Output);
   }
 
   function ShowWelcome()
   {
-        // Cookies have to be used before any text is sent to output
-        if(!array_key_exists('HideWelcome', $_COOKIE)) $_COOKIE['HideWelcome'] = 0;
-        if(isset($_GET['Action']))
-        {
-                if($_GET['Action'] == 'HideWelcome')
+    // Cookies have to be used before any text is sent to output
+    if(!array_key_exists('HideWelcome', $_COOKIE)) $_COOKIE['HideWelcome'] = 0;
+    if(isset($_GET['Action']))
+    {
+      if($_GET['Action'] == 'HideWelcome')
       {
         $_COOKIE['HideWelcome'] = 1;
         setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
       }
-                if($_GET['Action'] == 'UnHideWelcome')
+      if($_GET['Action'] == 'UnHideWelcome')
       {
-                        $_COOKIE['HideWelcome'] = 0;
+        $_COOKIE['HideWelcome'] = 0;
         setcookie('HideWelcome', $_COOKIE['HideWelcome'], time() + 3600 * 24 * 365);
-                }
-        }
+      }
+    }
 
-        if(isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))
-        {
-                $Action = '<a href="?Action=UnHideWelcome">'.T('Show welcome').'</a>';
-                $HideWelcome = 'display: none';
-        } else
-        {
-                $Action = '<a href="?Action=HideWelcome">'.T('Hide welcome').'</a>';
-                $HideWelcome = '';
-        }
+    if(isset($_COOKIE['HideWelcome']) and ($_COOKIE['HideWelcome'] == 1))
+    {
+      $Action = '<a href="?Action=UnHideWelcome">'.T('Show welcome').'</a>';
+      $HideWelcome = 'display: none';
+    } else
+    {
+      $Action = '<a href="?Action=HideWelcome">'.T('Hide welcome').'</a>';
+      $HideWelcome = '';
+    }
 
-        // Echo text even if it is hidden because of caching by external searching engines
-        return('<div style="'.$HideWelcome.'">'.
-                        '<div id="bannertitle">'.$this->System->Config['Web']['Title'].'</div>'.
-                        'Otevřený webový systém pro překládání textů ze hry World of Warcraft (WoW).<br />'.
-                        '<ul>'.
-                        '<li>Projekt je provozován jako otevřený vyznává principy volnosti a otevřenosti. Proto jsou texty volně ke stažení.</li>'.
-                        '<li>Projekt slouží k týmovému překladu. Kdokoliv může přispět přeložením textů a uveřejněním odkazu popř. banneru na svých stránkách.</li>'.
-                        '<li>Projekt není zaměřen pouze na jeden server a umožňuje společné překládání lidem z různých serverů. Překladatelé mohou překládat v týmech podle jména svého serveru a exportovat texty pouze od vybraných překladatelů.</li>'.
-                        '<li>Přeložené texty lze volně stahovat v různých tvarech jako XML, SQL, Addon a Lua. Přeložené texty lze tedy snadno importovat do svého free serveru nebo použít v jiných projektech.</li>'.
-                        '<li>Cílem projektu je přeložit všechny texty ze hry. Nikoliv pouze texty výprav (questů).</li>'.
+    // Echo text even if it is hidden because of caching by external searching engines
+    return('<div style="'.$HideWelcome.'">'.
+        '<div id="bannertitle">'.$this->System->Config['Web']['Title'].'</div>'.
+        'Otevřený webový systém pro překládání textů ze hry World of Warcraft (WoW).<br />'.
+        '<ul>'.
+        '<li>Projekt je provozován jako otevřený vyznává principy volnosti a otevřenosti. Proto jsou texty volně ke stažení.</li>'.
+        '<li>Projekt slouží k týmovému překladu. Kdokoliv může přispět přeložením textů a uveřejněním odkazu popř. banneru na svých stránkách.</li>'.
+        '<li>Projekt není zaměřen pouze na jeden server a umožňuje společné překládání lidem z různých serverů. Překladatelé mohou překládat v týmech podle jména svého serveru a exportovat texty pouze od vybraných překladatelů.</li>'.
+        '<li>Přeložené texty lze volně stahovat v různých tvarech jako XML, SQL, Addon a Lua. Přeložené texty lze tedy snadno importovat do svého free serveru nebo použít v jiných projektech.</li>'.
+        '<li>Cílem projektu je přeložit všechny texty ze hry. Nikoliv pouze texty výprav (questů).</li>'.
         '<li>Díky propracovanému systému volitelných exportů si můžete stáhnout libovolnou část překladu, klidně pouze výpravy. A vynechat tak překlady předmětů, jména postav a jiných.</li>'.
-                        '<li>Texty lze překládat do dvou jazyků, češtiny a slovenštiny.</li>'.
-                        '</ul></div>'.$Action);
+        '<li>Texty lze překládat do dvou jazyků, češtiny a slovenštiny.</li>'.
+        '</ul></div>'.$Action);
   }
 }

trunk/Modules/Import/Import.php

@@ -7 +7 @@
 class ModuleImport extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'Import';
-                $this->Version = '1.0';
-                $this->Creator = 'Chronos';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'Support for import of data.';
-                $this->Dependencies = array(); 
-        }
-
-        function Start()
-        {
-                $this->System->RegisterPage('import', 'PageImport');            
-        }
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Import';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Support for import of data.';
+    $this->Dependencies = array();
+  }
+
+  function Start()
+  {
+    $this->System->RegisterPage('import', 'PageImport');
+  }
 }
 
 class Import
 {
-  var $Version;  
+  var $Version;
   var $Group;
   var $NewItemCount;
   var $System;
-  
+
   function __construct($System)
   {
     $this->System = &$System;
   }
-  
+
   function SetVersion($Version)
   {
     global $System;
-    
+
     $DbResult = $System->Database->query('SELECT * FROM `ClientVersion` WHERE `Version` = "'.$Version.'"');
-    $this->Version = $DbResult->fetch_assoc();  
-  }
-  
+    $this->Version = $DbResult->fetch_assoc();
+  }
+
   function InsertItem($Value)
-  {   
+  {
     $insert = true;
     $Columns = '';
@@ -58 +58 @@
     $Where = ' (`'.$this->Group['PrimaryKeyItem'].'` = "'.$Value[$this->Group['PrimaryKeyItem']].'")  AND (`Language`=0) ' ;
     //print_r($Value);
-    
-    $DbResultMiddle = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` <= '.$this->Version['BuildNumber'].' AND `VersionEnd` >= '.$this->Version['BuildNumber'].' ORDER BY `VersionEnd` DESC LIMIT 1'); 
+
+    $DbResultMiddle = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` <= '.$this->Version['BuildNumber'].' AND `VersionEnd` >= '.$this->Version['BuildNumber'].' ORDER BY `VersionEnd` DESC LIMIT 1');
     $DbResultBefore = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionEnd` <= '.$this->Version['BuildNumber'].' ORDER BY `VersionEnd` DESC LIMIT 1');
     $DbResultAfter  = $this->System->Database->query('SELECT `VersionEnd`,`VersionStart`, `ID`, `Entry`, '.$Columns.' FROM `'.$this->Group['TablePrefix'].'` WHERE '.$Where.' AND `VersionStart` >= '.$this->Version['BuildNumber'].' ORDER BY `VersionStart` LIMIT 1');
@@ -69 +69 @@
       $DbRowAfter = $DbResultAfter->fetch_assoc();
       $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) {
              $set = ' , EndText = "'.$Value['EndText'].'" , ObjectiveText1 = "'.$Value['ObjectiveText1'].'"'.' , ObjectiveText2 = "'.$Value['ObjectiveText2'].'"'.' , ObjectiveText3 = "'.$Value['ObjectiveText3'].'"'.' , ObjectiveText4 = "'.$Value['ObjectiveText4'].'"';
-          } else $set = ''; 
+          } else $set = '';
           $this->System->Database->query('UPDATE `'.$this->Group['TablePrefix'].'` SET `VersionEnd` = "'.$this->Version['BuildNumber'].'" '.$set.' WHERE `ID`='.$DbRowBefore['ID']);
-          echo('b '); 
-          
-      } else 
-      if($this->HaveSameText($this->Group, $DbRowAfter, $Value) and ($DbResultAfter->num_rows > 0)) 
+          echo('b ');
+
+      } else
+      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 = ''; 
+          } 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'])) { 
+          echo('a ');
+
+      } else
+      {
+
+        if (isset($DbRowAfter['VersionStart'])) {
           if ($DbRowAfter['VersionStart'] <= $this->Version['BuildNumber']) {
             echo('Allready imported '.$DbRowBefore['Entry'].' ');
@@ -103 +103 @@
             $inserted = false;
           }
-        }       
-        
+        }
+
             //if [DEPRECATED] do not import
-        foreach($this->Group['Items'] as $GroupItem) { 
+        foreach($this->Group['Items'] as $GroupItem) {
           if (false !== strpos($Value[$GroupItem['Column']],'[DEPRECATED')) {
             echo('d '.$DbRowBefore['Entry'].' ');
             $insert = false;
-          }   
-        }    
+          }
+        }
 
         if ($insert) {
           $insert = false;
           foreach($this->Group['Items'] as $GroupItem)
-          { 
+          {
             if ($Value[$GroupItem['Column']] <> '') $insert = true;
           }
         }
-        
+
         if (isset($DbRowMiddle['Entry'])) $insert = false;
         if (isset($DbRowAfter['Entry'])) $Value['Entry'] = $DbRowAfter['Entry'];
         if (isset($DbRowBefore['Entry'])) $Value['Entry'] = $DbRowBefore['Entry'];
 
-        if ($insert) 
-        {      
-          
+        if ($insert)
+        {
+
           $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
           $Values = $Value['Entry'].', 0, '.$this->Version['BuildNumber'].', '.$this->Version['BuildNumber'];
-          foreach($this->Group['Items'] as $GroupItem) 
-          { 
+          foreach($this->Group['Items'] as $GroupItem)
+          {
             $Columns .= ', `'.$GroupItem['Column'].'`';
             $Values .= ', "'.$Value[$GroupItem['Column']].'"';
           }
           $this->System->Database->query('INSERT `'.$this->Group['TablePrefix'].'` ('.$Columns.') VALUES ('.$Values.')');
-     
+
           echo '
-          '.$Value['Entry'].' = '.$DbRowBefore['VersionStart'].'.'.$DbRowBefore['VersionEnd'].'< '.$this->Version['BuildNumber'].' <'.$DbRowAfter['VersionStart'].'.'.$DbRowAfter['VersionEnd'].'... '.$DbRowMiddle['VersionStart'].' '.$DbRowMiddle['VersionEnd'].' 
+          '.$Value['Entry'].' = '.$DbRowBefore['VersionStart'].'.'.$DbRowBefore['VersionEnd'].'< '.$this->Version['BuildNumber'].' <'.$DbRowAfter['VersionStart'].'.'.$DbRowAfter['VersionEnd'].'... '.$DbRowMiddle['VersionStart'].' '.$DbRowMiddle['VersionEnd'].'
           ';
-     
-          if (false !== strpos($Values,'[DEPRECATED'))   
+
+          if (false !== strpos($Values,'[DEPRECATED'))
           echo $Values;
-     
+
           echo('# ');
           $InsertId = $this->System->Database->insert_id;
           $this->System->ModuleManager->Modules['Log']->WriteLog('Text <a href="form.php?group='.$this->Group['Id'].'&amp;ID='.$InsertId.'">'.$InsertId.'</a> ('.$Value['Entry'].') ze skupiny '.$this->Group['Name'].' byl v nové verzi '.$this->Version['Version'].' změněn.', LOG_TYPE_IMPORT);
         }
-      }       
-    } else 
+      }
+    } else
     {
       // Insert new text
@@ -162 +162 @@
           $DbRow = $DbResult->fetch_row();
           $Value['Entry'] += $DbRow[0];
-        }           
+        }
       }
       $Columns = '`Entry`, `Language`, `VersionStart`, `VersionEnd`';
@@ -168 +168 @@
       $insert = false;
       foreach($this->Group['Items'] as $GroupItem)
-      { 
+      {
         $Columns .= ', `'.$GroupItem['Column'].'`';
         $Values .= ', "'.$Value[$GroupItem['Column']].'"';
@@ -182 +182 @@
     }
   }
-  
+
   function ImportLUA()
   {
     global $TranslationTree, $PatchVersion;
     $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;
@@ -215 +215 @@
                 $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 
+                $Line = trim(substr($Line, strpos($TempLine, '"') + 1)); // Skip closing quote and semicolon
+              } else
               {
                 // Nonstring value
@@ -224 +224 @@
               $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
               //print_r($Value);
-          
+
               $this->InsertItem($Value);
-            };  
+            };
             $Count++;
           }
@@ -237 +237 @@
     return ($Output);
   }
-  
+
   function UpdateTranslated()
   {
     global $TranslationTree, $PatchVersion, $Config;
-  
+
     $Output = '<br /><br />Začínám se synchronizací VersionEnd u přeložených textů<br />';
-    foreach($TranslationTree as $Group)  
-    {
-      $Output .= '<br />'.$Group['Name'].' ';  
-      $do = true;   
-      while($do) 
+    foreach($TranslationTree as $Group)
+    {
+      $Output .= '<br />'.$Group['Name'].' ';
+      $do = true;
+      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 `'.
-        $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`');
-        $do = ($DbResult->num_rows > 0);
-        while($DbRow = $DbResult->fetch_assoc()) 
-        { 
+        '`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`');
+        $do = ($DbResult->num_rows > 0);
+        while($DbRow = $DbResult->fetch_assoc())
+        {
           echo '`';
           $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$DbRow['VersionEnd_orig'].', `VersionStart` = '.$DbRow['VersionStart_orig'].' WHERE `ID` = '.$DbRow['ID']);
-          $Output .= '. '; 
-        } 
-      } 
+          $Output .= '. ';
+        }
+      }
       $Output .= '<strong>Dokončeno.</strong>';
     }
     return($Output);
   }
-  
+
   function HaveSameText($Group, $DbRow2, $Value)
   {
     $result = true;
-    foreach($Group['Items'] as $GroupItem) 
-    { 
+    foreach($Group['Items'] as $GroupItem)
+    {
       $old = $DbRow2[$GroupItem['Column']];
       $old = str_replace(chr(10), '', $old);
@@ -291 +291 @@
       $old = strtolower($old);
       $old = str_replace('$b', '', $old);
-      
-      if ($this->Group['Id'] == 1) 
+
+      if ($this->Group['Id'] == 1)
        while ($part = substr($old, strpos($old, '<'), strpos($old, '>')-strpos($old, '<')))
-        if ($part <> '') { 
+        if ($part <> '') {
           $old = str_replace($part.'>', '', $old);
         }
-  
+
       if (($GroupItem['MangosColumn'] <> '') and ($Group['MangosDatabase'] == 'mangos'))
         $new = $Value[$GroupItem['MangosColumn']];
         else $new = $Value[$GroupItem['Column']];
-        
+
       $new = str_replace(chr(10), '', $new);
       $new = str_replace(chr(13), '', $new);
@@ -318 +318 @@
       $new = str_replace('$b', '', $new);
 
-      if ($this->Group['Id'] == 1) 
+      if ($this->Group['Id'] == 1)
        while ($part = substr($new, strpos($new, '<'), strpos($new, '>')-strpos($new, '<')))
-        if ($part <> '') { 
+        if ($part <> '') {
           $new = str_replace($part.'>', '', $new);
         }
-      
+
       if(($old == 'null') or ($old == 'NULL')) $old = '';
       if(($new == 'null') or ($new == 'NULL')) $new = '';
-  
-      if(($new <> '') and ($old <> $new) and ($GroupItem['Column'] <> 'Comment')) 
+
+      if(($new <> '') and ($old <> $new) and ($GroupItem['Column'] <> 'Comment'))
       {
         //  echo $old.'X'.$new;
-        if ( ($GroupItem['Column'] <> 'EndText') 
-        and ($GroupItem['Column'] <> 'ObjectiveText1') 
-        and ($GroupItem['Column'] <> 'ObjectiveText2') 
-        and ($GroupItem['Column'] <> 'ObjectiveText3') 
-        and ($GroupItem['Column'] <> 'ObjectiveText4') ) 
+        if ( ($GroupItem['Column'] <> 'EndText')
+        and ($GroupItem['Column'] <> 'ObjectiveText1')
+        and ($GroupItem['Column'] <> 'ObjectiveText2')
+        and ($GroupItem['Column'] <> 'ObjectiveText3')
+        and ($GroupItem['Column'] <> 'ObjectiveText4') )
           $result = false;
       }
     }
-        
+
     return($result);
   }
-  
+
   function ImportDBC()
   {
     global $System, $TranslationTree, $Config;
-  
+
     $Output = 'Načítání textů z DBC souboru...';
     if(($this->Group['DBCFileName'] != '') and ($this->Group['TablePrefix'] != ''))
     {
-      $Output .= '<br />'.$this->Group['Name'].'<br />'; 
+      $Output .= '<br />'.$this->Group['Name'].'<br />';
 
       // Load string column index list
-      $DbResult = $System->Database->query('SELECT * FROM `GroupItem` JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->Version['Id'].'  WHERE `GroupItem`.`Group` = '.$this->Group['Id']);      
-      
+      $DbResult = $System->Database->query('SELECT * FROM `GroupItem` JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->Version['Id'].'  WHERE `GroupItem`.`Group` = '.$this->Group['Id']);
+
       $ColumnIndexes = array();
       $ColumnFormat = array();
@@ -361 +361 @@
         $ColumnIndexes[$DbRow['GroupItem']] = $DbRow['ColumnIndex'];
       }
-      
+
       $DBCFile = new DBCFile();
       $DBCFile->OpenFile(dirname(__FILE__).'/../../source/'.$this->Version['Version'].'/dbc/'.$this->Group['DBCFileName'].'.dbc', $ColumnFormat);
       $ItemCount = $DBCFile->GetRecordCount();
       $this->NewItemCount = 0;
-      $Count = 0;      
-        
+      $Count = 0;
+
       for($I = 0; $I < $ItemCount; $I++)
       {
@@ -373 +373 @@
         if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
         {
-          $Value[$GroupItem['Column']] = addslashes($DBCFile->GetString($I, $ColumnIndexes[$GroupItem['Id']])); 
-        }
-        
+          $Value[$GroupItem['Column']] = addslashes($DBCFile->GetString($I, $ColumnIndexes[$GroupItem['Id']]));
+        }
+
         // Get multicolumn value
         $Columns = explode(',', $this->Group['DBCIndex']);
@@ -381 +381 @@
         foreach($Columns as $Column)
           $ColumnValue .= '_'.$DBCFile->GetUint($I, $Column);
-        $ColumnValue = substr($ColumnValue, 1);          
-        $Value[$this->Group['PrimaryKeyItem']] = $ColumnValue;          
+        $ColumnValue = substr($ColumnValue, 1);
+        $Value[$this->Group['PrimaryKeyItem']] = $ColumnValue;
         $this->InsertItem($Value);
         $Count++;
-      }   
+      }
       $Output .= '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
       $this->UpdateLastVersion();
@@ -396 +396 @@
   {
     global $TranslationTree;
-    
+
     $this->Group = $TranslationTree[$GroupId];
-    
+
     if($this->Group['SourceType'] == 'dbc') $Output = $this->ImportDBC();
     else if($this->Group['SourceType'] == 'sql') $Output = $this->ImportSQL();
@@ -406 +406 @@
     return($Output);
   }
-  
+
   function ImportSQL()
   {
     global $TranslationTree, $PatchVersion;
-  
+
     $Output= '';
     $File = new FileStream();
@@ -422 +422 @@
       $Line = $File->ReadLine();
       // Struktura
-      if(strpos($Line, 'CREATE TABLE `'.$this->Group['MangosTable'].'`') !== false) 
+      if(strpos($Line, 'CREATE TABLE `'.$this->Group['MangosTable'].'`') !== false)
       {
         $Line = '';
@@ -428 +428 @@
         $i = 0;
       }
-      if((strpos($Line, ';') !== false) and ($folow_structure == true)) 
+      if((strpos($Line, ';') !== false) and ($folow_structure == true))
       {
         $folow_structure = false;
@@ -443 +443 @@
         $i++;
       }
-    
+
       //data
       if((strpos($Line, 'INSERT INTO `'.$this->Group['MangosTable'].'`') !== false) and (isset($structure)))
-      { 
+      {
         while ((strpos($Line, ');') === false) or ($File->EOF()))
           $Line = $Line.$File->ReadLine();
         $Line = str_replace("),\n(", '),(', $Line);
-        
+
         $Line = substr($Line, strpos($Line, '(') + 1);
         $Line = substr($Line, 0, strpos($Line, ');'));
         $LineParts = explode('),(', $Line);
-        
+
         unset($Line);
-        
+
         $value_buff = '';
         $Value = '';
         foreach($LineParts as $LinePart)
         {
-          
+
           unset($Value, $value_buff);
           foreach($structure as $i => $column)
@@ -469 +469 @@
               $value_buff = substr($LinePart, 0, strpos($LinePart, ','));
               $LinePart = substr($LinePart, strlen($value_buff) + 1);
-            } else 
+            } else
             {
               $LinePart = substr($LinePart, 1);
               $value_buff = substr($LinePart, 0, strpos($LinePart, "'"));
-              while(substr($value_buff, strlen($value_buff) - 1, 1) == "\\") 
+              while(substr($value_buff, strlen($value_buff) - 1, 1) == "\\")
               {
                 $str = substr($LinePart, strlen($value_buff));
@@ -479 +479 @@
                 $value_buff = $value_buff.$str2;
                 $str = substr($str, strlen($str2));
-              }  
+              }
               $LinePart = substr($LinePart, strlen($value_buff) + 2);
-            } 
+            }
             if(($value_buff != 'null') and ($value_buff != 'NULL'))
             {
               $str = '';
-              while(substr($value_buff, strlen($value_buff) - 1,1) == " ") 
+              while(substr($value_buff, strlen($value_buff) - 1,1) == " ")
               {
                 $value_buff = substr($value_buff, 0, strlen($value_buff) - 1);
@@ -491 +491 @@
               }
               $str2 = '';
-              while(substr($value_buff, 0, 1) == ' ') 
+              while(substr($value_buff, 0, 1) == ' ')
               {
                 $value_buff = substr($value_buff, 1, strlen($value_buff) - 1);
@@ -497 +497 @@
               }
               $Value[$column] = $str2.trim($value_buff).$str;
-            } else 
-            { 
+            } else
+            {
               $Value[$column] = '';
             }
@@ -513 +513 @@
               }
           }
-            
+
           // Get multicolumn value
           $Columns = explode(',', $this->Group['MangosTableIndex']);
@@ -519 +519 @@
           foreach($Columns as $Column)
             $ColumnValue .= '_'.$Value[$Column];
-          $ColumnValue = substr($ColumnValue, 1);          
+          $ColumnValue = substr($ColumnValue, 1);
           $Value[$this->Group['PrimaryKeyItem']] = $ColumnValue;
           $this->InsertItem($Value);
           $Count++;
         }
-      } 
+      }
     }
     $Output = '<br />Celkem: '.$Count.'  Nových: '.$this->NewItemCount.'<br />';
@@ -530 +530 @@
     return($Output);
   }
-  
+
   function UpdateLastVersion() {
     $DbResult = $this->System->Database->query('SELECT * FROM `Group` WHERE `Id`='.$this->Group['Id']);
-    $Version = $DbResult->fetch_assoc();  
+    $Version = $DbResult->fetch_assoc();
     if ($Version['LastVersion'] < $this->Version['BuildNumber'])
       $this->System->Database->query('UPDATE `Group` SET `LastVersion` = "'.$this->Version['BuildNumber'].'", `LastImport` = NOW() WHERE `Id`='.$this->Group['Id']);

trunk/Modules/Import/Manage.php

@@ -26 +26 @@
 {
   global $System;
-  
-  if(array_key_exists('id', $_GET)) 
+
+  if(array_key_exists('id', $_GET))
   {
     $Output = '<div style="font-size: xx-small;">';
-    
+
     $GroupId = (int)$_GET['id'];
     $Import = new Import($System);
     $Import->SetVersion($System->Config['Web']['GameVersion']);
     $Output .= $Import->ImportGroup($GroupId);
-  
+
     $this->System->ModuleManager->Modules['Log']->WriteLog('Plnění databáze', LOG_TYPE_MODERATOR);
     $Output .= '</div>';
@@ -45 +45 @@
 {
   global $TranslationTree, $System;
-  
-  $Output = '</div><div><strong>Import zdrojů:</strong></div>'.  
+
+  $Output = '</div><div><strong>Import zdrojů:</strong></div>'.
     '<div><a href="?action=instructions">Instrukce pro přípravu zdrojových souborů</a></div>'.
     '<div><a href="?action=update_translated">Zaktualizovat verze přeložených</a></div><br/>'.
@@ -52 +52 @@
   $DbResult = $System->Database->query('SELECT COUNT(*) FROM `Group`');
   $DbRow = $DbResult->fetch_row();
-  $PageList = GetPageList($DbRow[0]);  
+  $PageList = GetPageList($DbRow[0]);
   $Output .= '<h3>Seznam překladových skupin</h3>';
   $Output .= $PageList['Output'];
-  
+
   $Output .= '<table class="BaseTable">';
   $TableColumns = array(
-    array('Name' => 'Name', 'Title' => 'Jméno'), 
-    array('Name' => 'SourceType', 'Title' => 'Typ zdroje'), 
-    array('Name' => 'SourceName', 'Title' => 'Jméno zdroje'), 
-    array('Name' => 'LastImport', 'Title' => 'Datum'), 
+    array('Name' => 'Name', 'Title' => 'Jméno'),
+    array('Name' => 'SourceType', 'Title' => 'Typ zdroje'),
+    array('Name' => 'SourceName', 'Title' => 'Jméno zdroje'),
+    array('Name' => 'LastImport', 'Title' => 'Datum'),
     array('Name' => 'LastVersion', 'Title' => 'Verze'),
-    array('Name' => '', 'Title' => 'Akce'), 
+    array('Name' => '', 'Title' => 'Akce'),
   );
 
@@ -70 +70 @@
 
   $DbResult = $System->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-  while($Group = $DbResult->fetch_assoc()) 
+  while($Group = $DbResult->fetch_assoc())
   {
     $Output .= '<tr><td>'.$Group['Name'].'</td><td>'.$Group['SourceType'].'</td><td>';
@@ -85 +85 @@
 {
   global $System;
-  
+
   $Output = '<div style="font-size: xx-small;">';
   $Import = new Import($System);
@@ -93 +93 @@
 }
 
-        function Show()
-        {
-                $this->Title = T('Import');
+  function Show()
+  {
+    $this->Title = T('Import');
     $Output = '';
     if($this->System->User->Licence(LICENCE_ADMIN))
@@ -104 +104 @@
       else if($_GET['action'] == 'importgroup') $Output .= $this->ShowImportGroup();
       else if($_GET['action'] == 'update_translated') $Output .= $this->UpdateTranslated();
-      else $Output .= $this->ShowMenu();                                           
+      else $Output .= $this->ShowMenu();
     } else $Output .= $this->ShowMenu();
-    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);    
+    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
     return($Output);
-        }
+  }
 }

trunk/Modules/Import/cmd.php

@@ -7 +7 @@
   $System = new System();
   $System->DoNotShowPage = true;
-        $System->Run();
+    $System->Run();
 $Import = new Import($System);
 
 $Output = '';
 
-if(defined('STDIN') == false) 
+if(defined('STDIN') == false)
 {
   $Output = T('Access denied');
   exit($Output);
-} 
+}
 
 foreach($_SERVER['argv'] as $parameter)
@@ -32 +32 @@
 {
   $Output .= '
-  
+
   1. Pripojíme se pres SSH na server (wowpreklad.zdechov.net) napríklad pres program putty.exe nebo terminál v linuxu.
-2. Nejprve je potreba získat zdrojová data. Není zapotrebí mít všechny typy textu. 
+2. Nejprve je potreba získat zdrojová data. Není zapotrebí mít všechny typy textu.
   a) SQL databázi UDB seženeme na fóru: http://udbforums.kicks-ass.net/index.php?board=5.0 , sobor rozbalíme a uložíme do adresáre "wowpreklad/source/císlo_verze/sql/"
   b) DBC a LUA soubory exportujeme přímo ze hry z souboru "World of Warcraft\Data\enGB\locale-enGB.MPQ" a všechny soubory "wow-update-enGB-<buildnumber>.MPQ". Tyto soubory je nutné otevřít najednou v merge modu programu "MPQEditor.exe", který je ke stažení v adresáři "wowpreklad/download". DBC soubory jsou v MPQ souboru uloženy ve složce "DBFilesClient". Lua ve složce "Interface". Tyto soubory zkopírujte do složky "wowpreklad/source/císlo_verze/dbc/" nebo "lua"
@@ -41 +41 @@
 5. Až máme všechno pripraveno spustíme v konzoli script príkazem "php wowpreklad/import/cmd.php" kde jsou popsané možnosti paremetu s kterýma se tento script spoucí pro ruzné importy.
 6. Po provedení importu je potreba nekolikrát spustit script na aktualizaci verze u prekladu. Je potreba ho prováde opakovane dokud nezmizí tecky oznacující že byly provedeny zmeny.
-                                           
-  
+
+
   Parametry:
   ';
@@ -48 +48 @@
   $Output .= '   version=<version> - nastaví verzi importu default: '.$System->Config['Web']['GameVersion'].'<br /><br />';
       $Output .= '    <id_import_group>:';
-    foreach($TranslationTree as $Group)  
+    foreach($TranslationTree as $Group)
     {
-      $Output .= '<br />    '.$Group['Id'].' ';     
-      $Output .= '    '.$Group['Name'].' ';     
+      $Output .= '<br />    '.$Group['Id'].' ';
+      $Output .= '    '.$Group['Name'].' ';
     }
 
@@ -61 +61 @@
    else
       $Import->SetVersion($System->Config['Web']['GameVersion']);
-  
+
    $Output .= $Import->ImportGroup($_GET['id']); //$Config['Web']['GameVersion']
     //  $Import->UpdateTranslated();
@@ -72 +72 @@
     $Output .= '<br />'.
       'aktuálně nastavená importovávaná verze: '.$_GET['version'].'<br />';
-  else 
+  else
     $Output .= '<br />'.
       'aktuálně nastavená importovávaná verze: '.$Config['Web']['GameVersion'].'<br />';
@@ -79 +79 @@
 $Output = str_replace('<br />','
 ',$Output);
-echo($Output);  
-//ShowFooter();      
+echo($Output);
+//ShowFooter();

trunk/Modules/Log/Log.php

@@ -3 +3 @@
 class ModuleLog extends AppModule
 {
-        var $Excludes;
-        
+  var $Excludes;
+
   function __construct($System)
   {
@@ -14 +14 @@
     $this->Description = 'Log various application events';
     $this->Dependencies = array('Error', 'News');
-    
+
     $this->Excludes = array();
   }
-  
+
   function Start()
   {
-        $this->System->RegisterPage('log.php', 'PageLog');
-        $this->System->ModuleManager->Modules['Error']->OnError[] = array($this, 'DoAddItem');
-        $this->System->ModuleManager->Modules['News']->RegisterRSS(array('Title' => T('Logs'), 
-          'Channel' => 'log', 'Callback' => array('PageLog', 'ShowRSS'), 'Permission' => LICENCE_ADMIN));
-  }  
-  
+    $this->System->RegisterPage('log.php', 'PageLog');
+    $this->System->ModuleManager->Modules['Error']->OnError[] = array($this, 'DoAddItem');
+    $this->System->ModuleManager->Modules['News']->RegisterRSS(array('Title' => T('Logs'),
+      'Channel' => 'log', 'Callback' => array('PageLog', 'ShowRSS'), 'Permission' => LICENCE_ADMIN));
+  }
+
   function DoAddItem($Message)
   {
-        $this->WriteLog($Message, LOG_TYPE_ERROR);
+    $this->WriteLog($Message, LOG_TYPE_ERROR);
   }
 
   function WriteLog($Text, $Type)
   {
-        if(isset($this->System->User) and !is_null($this->System->User->Id)) 
-          $UserId = $this->System->User->Id;
-          else $UserId = 'NULL';
-        $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
-          'VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.
-          GetRemoteAddress().'", "'.GetRequestURI().'")';
-        $this->System->Database->query($Query);
+    if(isset($this->System->User) and !is_null($this->System->User->Id))
+      $UserId = $this->System->User->Id;
+      else $UserId = 'NULL';
+    $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
+      'VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.
+      GetRemoteAddress().'", "'.GetRequestURI().'")';
+    $this->System->Database->query($Query);
   }
 }
@@ -55 +55 @@
 define('LOG_TYPE_PAGE_NOT_FOUND', 15);
 
-// TODO: Change global function to module class local method  
+// TODO: Change global function to module class local method
 function WriteLog($Text, $Type)
 {
-        global $System, $User;
-        
-        if(isset($User) and !is_null($User->Id)) $UserId = $User->Id;
-          else $UserId = 'NULL';
-        $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
-          'VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.
+  global $System, $User;
+
+  if(isset($User) and !is_null($User->Id)) $UserId = $User->Id;
+    else $UserId = 'NULL';
+  $Query = 'INSERT INTO `Log` ( `User` , `Type` , `Text` , `Date` , `IP`, `URL` ) '.
+    'VALUES ('.$UserId.', '.$Type.', "'.addslashes($Text).'", NOW(), "'.
       GetRemoteAddress().'", "'.GetRequestURI().'")';
-        $System->Database->query($Query);
+  $System->Database->query($Query);
 }
 
@@ -72 +72 @@
   function ShowRSS()
   {
-        $this->RawPage = true;
-        $Output = '';
+    $this->RawPage = true;
+    $Output = '';
     $Items = array();
-    if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"'; 
+    if(array_key_exists('type', $_GET)) $Where = ' WHERE `Type` = "'.($_GET['type'] * 1).'"';
       else $Where = '';
     $sql = 'SELECT *, UNIX_TIMESTAMP(`Date`) AS `TimeCreate`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName`, `Date` FROM `Log`'.
       $Where.' ORDER BY `Date` DESC LIMIT 100';
     $DbResult = $this->System->Database->query($sql);
-    while($Line = $DbResult->fetch_assoc()) 
+    while($Line = $DbResult->fetch_assoc())
     {
       $DbResult2 = $this->System->Database->query('SELECT * FROM `LogType` WHERE `Id`='.$Line['Type']);
       $LogType = $DbResult2->fetch_assoc();
-      
+
       if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
       $Line['Text'] = str_replace("\n", '<br>', $Line['Text']);
-    
+
       $Items[] = array
       (
@@ -96 +96 @@
         'Time' => $Line['TimeCreate'],
       );
-    } 
+    }
 
     $Output .= GenerateRSS(array
@@ -108 +108 @@
     return($Output);
   }
-  
+
   function Show()
   {
-                if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-                  else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
-                  else $Action = '';            
-                if($Action == 'delerrlog') $Output = $this->DeleteErrorLog();
-                else $Output = $this->ShowList();
-                return($Output);
-  }
-  
+    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+      else $Action = '';
+    if($Action == 'delerrlog') $Output = $this->DeleteErrorLog();
+    else $Output = $this->ShowList();
+    return($Output);
+  }
+
   function ShowList()
   {
     global $TranslationTree;
-    
+
     $this->Title = T('System log');
     $Output = '';
-    if(array_key_exists('type', $_GET)) $_SESSION['type'] = $_GET['type'] * 1; 
+    if(array_key_exists('type', $_GET)) $_SESSION['type'] = $_GET['type'] * 1;
     else if(!array_key_exists('type', $_SESSION)) $_SESSION['type'] = '';
 
     if(array_key_exists('group', $_GET)) $_SESSION['group'] = $_GET['group'];
 
-    if($_SESSION['type'] != '') $WhereType = ' (`Type`='.$_SESSION['type'].')'; 
+    if($_SESSION['type'] != '') $WhereType = ' (`Type`='.$_SESSION['type'].')';
       else $WhereType = '1=1';
-    
+
     $RSSChannels = array(
-        array('Title' => 'Záznamy změn', 'Channel' => 'log&amp;type='.$_SESSION['type'])
+      array('Title' => 'Záznamy změn', 'Channel' => 'log&amp;type='.$_SESSION['type'])
     );
-  
+
     // Show category filter
     if($this->System->User->Licence(LICENCE_MODERATOR))
@@ -154 +154 @@
      $Output .= '<br /><br />';
 
-    if(array_key_exists('type', $_SESSION)) $Where = ' WHERE '.$WhereType; 
+    if(array_key_exists('type', $_SESSION)) $Where = ' WHERE '.$WhereType;
     else
     {
       if(array_key_exists('group', $_SESSION)) $Where = ' WHERE `Text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
         else $Where = '';
-    } 
+    }
     //if(($Where != '') and (array_key_exists('group', $_SESSION))) $Where .= ' AND text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
 
     $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` '.$Where);
     $DbRow = $DbResult->fetch_row();
-    $PageList = GetPageList($DbRow[0]);    
-  
+    $PageList = GetPageList($DbRow[0]);
+
     $Output .= $PageList['Output'];
-  
+
     $TableColumns = array(
       array('Name' => 'Date', 'Title' => 'Čas'),
     );
-    if($_SESSION['type'] == '') $TableColumns[] = 
+    if($_SESSION['type'] == '') $TableColumns[] =
       array('Name' => 'LogName', 'Title' => 'Typ');
-    $TableColumns = array_merge($TableColumns, array( 
-          array('Name' => 'Text', 'Title' => 'Text'), 
-      array('Name' => 'UserName', 'Title' => 'Uživatel'), 
-      array('Name' => 'IP', 'Title' => 'Adresa'), 
+    $TableColumns = array_merge($TableColumns, array(
+      array('Name' => 'Text', 'Title' => 'Text'),
+      array('Name' => 'UserName', 'Title' => 'Uživatel'),
+      array('Name' => 'IP', 'Title' => 'Adresa'),
       array('Name' => 'URL', 'Title' => 'URL'),
     ));
@@ -182 +182 @@
     $Output .= '<table width="98%" class="BaseTable">'.
       $Order['Output'];
-  
+
     $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, `LogType`.`Name` AS `LogName`, '.
       '(SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName` FROM `Log` LEFT JOIN `LogType` ON `LogType`.`Id`=`Log`.`Type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
     $DbResult = $this->System->Database->query($sql);
-    while($Line = $DbResult->fetch_assoc()) 
-    {
-          if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
       $Line['Text'] = str_replace("\n", '<br>', $Line['Text']);
-          $Output .= '<tr><td>'.$Line['Date'].'</td>';
-          if($_SESSION['type'] == '') $Output .= '<td>'.$Line['LogName'].'</td>';
+      $Output .= '<tr><td>'.$Line['Date'].'</td>';
+      if($_SESSION['type'] == '') $Output .= '<td>'.$Line['LogName'].'</td>';
       $Output .= '<td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td>'.
       '<td><a href="'.$this->System->Link('/user.php?user='.$Line['User']).'">'.$Line['UserName'].'</a></td>'.
       '<td>'.$Line['IP'].'</td>'.
-          '<td>'.$Line['URL'].'</td></tr>';
+      '<td>'.$Line['URL'].'</td></tr>';
     }
     $Output .= '</table>'.
@@ -203 +203 @@
         $Output .= '<div>Vymazat: <a href="'.$this->System->Link('/log.php?a=delerrlog&amp;type='.LOG_TYPE_ERROR).'">Chybové záznamy</a> '.
           '<a href="'.$this->System->Link('/log.php?a=delerrlog&amp;type='.LOG_TYPE_PAGE_NOT_FOUND).'">Neznámé stránky</a></div>';
-      }     
+      }
     } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-  
-    return($Output);  
-  }
-  
+
+    return($Output);
+  }
+
   function DeleteErrorLog()
   {
-        if($this->System->User->Licence(LICENCE_ADMIN) and 
-        (($_GET['type'] == LOG_TYPE_ERROR) or ($_GET['type'] == LOG_TYPE_PAGE_NOT_FOUND)))
-        {
-                $DbResult = $this->System->Database->select('LogType', '*', 'Id='.$_GET['type']);
-                $LogType = $DbResult->fetch_assoc();
-          $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` WHERE `Type`='.$_GET['type']);
-          $DbRow = $DbResult->fetch_row();
-          $this->System->Database->query('DELETE FROM `Log` WHERE `Type`='.$_GET['type']);
-          $this->System->ModuleManager->Modules['Log']->WriteLog('Vymazáno záznamů z '.$LogType['Description'].'.', LOG_TYPE_ADMINISTRATION);
-          $Output = ShowMessage('Smazáno všech '.$DbRow[0].' záznamů z '.$LogType['Description'].'.');
-          $Output .= $this->ShowList();
-          return($Output);
-        } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    if($this->System->User->Licence(LICENCE_ADMIN) and
+    (($_GET['type'] == LOG_TYPE_ERROR) or ($_GET['type'] == LOG_TYPE_PAGE_NOT_FOUND)))
+    {
+      $DbResult = $this->System->Database->select('LogType', '*', 'Id='.$_GET['type']);
+      $LogType = $DbResult->fetch_assoc();
+      $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Log` WHERE `Type`='.$_GET['type']);
+      $DbRow = $DbResult->fetch_row();
+      $this->System->Database->query('DELETE FROM `Log` WHERE `Type`='.$_GET['type']);
+      $this->System->ModuleManager->Modules['Log']->WriteLog('Vymazáno záznamů z '.$LogType['Description'].'.', LOG_TYPE_ADMINISTRATION);
+      $Output = ShowMessage('Smazáno všech '.$DbRow[0].' záznamů z '.$LogType['Description'].'.');
+      $Output .= $this->ShowList();
+      return($Output);
+    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
   }
 }

trunk/Modules/News/News.php

@@ -20 +20 @@
   function Start()
   {
-        $this->System->RegisterPage('news', 'PageNews');
-        $this->System->RegisterPage('rss', 'PageRSS');
-        $this->RegisterRSS(array('Title' => T('News'), 'Channel' => 'news',
-          'Callback' => array('PageNews', 'ShowRSS'), 'Permission' => LICENCE_ANONYMOUS));
+    $this->System->RegisterPage('news', 'PageNews');
+    $this->System->RegisterPage('rss', 'PageRSS');
+    $this->RegisterRSS(array('Title' => T('News'), 'Channel' => 'news',
+      'Callback' => array('PageNews', 'ShowRSS'), 'Permission' => LICENCE_ANONYMOUS));
   }
 
   function ShowBox()
   {
-        $Output = '<strong>'.T('System changes').':</strong><div class="NewsBox">';
-        $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`'.
-                ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-        while($DbRow = $DbResult->fetch_assoc())
-                $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
-        $Output .= '<a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
-        $Output .= '</div>';    
-        return($Output);
+    $Output = '<strong>'.T('System changes').':</strong><div class="NewsBox">';
+    $DbResult = $this->Database->query('SELECT `News`.`Time`, `User`.`Name`, `News`.`Text`,`News`.`Title`'.
+      ' FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+    while($DbRow = $DbResult->fetch_assoc())
+      $Output .= '<div><strong>'.$DbRow['Title'].' ('.HumanDate($DbRow['Time']).')</strong> <br />'.$DbRow['Text'].' ('.$DbRow['Name'].')</div>';
+    $Output .= '<a href="'.$this->System->Link('/news/').'">'.T('All news').'</a>';
+    $Output .= '</div>';
+    return($Output);
   }
 
@@ -41 +41 @@
   {
     $this->RSSChannels[$Channel['Channel']] = $Channel;
-    
+
     if(is_null($Pos)) $this->RSSChannelsPos[] = $Channel['Channel'];
     else {
@@ -52 +52 @@
     $Output = '';
     foreach($this->RSSChannels as $Channel)
-                {
-                  if($this->System->User->Licence($Channel['Permission']))
-                          $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
-                        $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
-                }
+    {
+      if($this->System->User->Licence($Channel['Permission']))
+        $Output .= ' <link rel="alternate" title="'.$Channel['Title'].'" href="'.
+          $this->System->Link('/rss/?channel='.$Channel['Channel']).'" type="application/rss+xml" />';
+    }
     return($Output);
   }
@@ -63 +63 @@
 class PageNews extends Page
 {
-        function Show()
-        {
-                $this->Title = T('News');
-                if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-                  else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
-                  else $Action = '';
-                if($Action == 'add2') $Output = $this->SaveNew();
-                if($Action == 'add') $Output = $this->ShowAddForm();
-                else $Output = $this->ShowList();
-                return($Output);
-        }
+  function Show()
+  {
+    $this->Title = T('News');
+    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+      else $Action = '';
+    if($Action == 'add2') $Output = $this->SaveNew();
+    if($Action == 'add') $Output = $this->ShowAddForm();
+    else $Output = $this->ShowList();
+    return($Output);
+  }
 
-        function ShowList()
-        {
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `News`');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-                
-                $Output = '<h3>'.T('News').'</h3>'.$PageList['Output'];
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                        $Output .= ' <a href="?a=add">'.T('Add').'</a>';
-                $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
-                                '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc())
-                        $Output .= '<div><strong>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</strong><br/> '.$Line['Text'].' ('.$Line['User'].')</div>';
-                $Output .= '</div>'.$PageList['Output'];
-                return($Output);
-        }
+  function ShowList()
+  {
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `News`');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
 
-        function ShowAddForm()
-        {
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                  $Output = '<form action="?" method="POST">'.
-                          T('User').': '.$this->System->User->Name.'('.$this->System->User->Id.')<br/> '.
-                          T('Title').': <input type="text" name="title" size="40"/><br/>'.
-                          T('Content').': <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
-                          '<input type="hidden" name="a" value="add2"/>'.
-                          '<input type="submit" value="'.T('Save').'"/><br/>'.
-                          '</form>';
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function SaveNew()
-        {
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                  if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
-                  {
-                        $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
-                                         $this->System->User->Id.', "'.$_POST['text'].'")';
-                          $this->System->Database->query($querty);
-                          $Output = ShowMessage(T('News added'));
-                          $this->System->ModuleManager->Modules['Log']->WriteLog('Vložena nová aktualita', LOG_TYPE_ADMINISTRATION);
-                          $Output .= $this->ShowList();
-                  } else $Output = ShowMessage(T('Data not specified'), MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
+    $Output = '<h3>'.T('News').'</h3>'.$PageList['Output'];
+    if($this->System->User->Licence(LICENCE_ADMIN))
+      $Output .= ' <a href="?a=add">'.T('Add').'</a>';
+    $Output .= '<div class="shoutbox">';
+    $DbResult = $this->System->Database->query('SELECT `News`.`Time`, `News`.`Text`, `News`.`Title`, '.
+        '`User`.`Name` AS `User` FROM `News` JOIN `User` ON `User`.`Id`=`News`.`User` ORDER BY `News`.`Time` DESC '.$PageList['SQLLimit']);
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<div><strong>'.$Line['Title'].' ('.HumanDate($Line['Time']).')</strong><br/> '.$Line['Text'].' ('.$Line['User'].')</div>';
+    $Output .= '</div>'.$PageList['Output'];
+    return($Output);
+  }
 
-        function ShowRSS()
-        {
-                $Items = array();
+  function ShowAddForm()
+  {
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $Output = '<form action="?" method="POST">'.
+        T('User').': '.$this->System->User->Name.'('.$this->System->User->Id.')<br/> '.
+        T('Title').': <input type="text" name="title" size="40"/><br/>'.
+        T('Content').': <textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Text" name="text"></textarea><br/>'.
+        '<input type="hidden" name="a" value="add2"/>'.
+        '<input type="submit" value="'.T('Save').'"/><br/>'.
+        '</form>';
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function SaveNew()
+  {
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      if(array_key_exists('text', $_POST) and array_key_exists('title', $_POST))
+      {
+        $querty = 'INSERT INTO `News` (`Title`, `Time` ,`User` ,`Text`) VALUES ( "'.$_POST['title'].'", NOW( ) , '.
+           $this->System->User->Id.', "'.$_POST['text'].'")';
+        $this->System->Database->query($querty);
+        $Output = ShowMessage(T('News added'));
+        $this->System->ModuleManager->Modules['Log']->WriteLog('Vložena nová aktualita', LOG_TYPE_ADMINISTRATION);
+        $Output .= $this->ShowList();
+      } else $Output = ShowMessage(T('Data not specified'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowRSS()
+  {
+    $Items = array();
     $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`News`.`Time`) AS `UnixTime`, '.
-            '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text` '.
-            'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
-          while($DbRow = $DbResult->fetch_assoc())
-          {
-           $Items[] = array
-           (
-             'Title' => $DbRow['Title'],
-             'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
-             'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
-             'Time' => $DbRow['UnixTime'],
-           );
-          }
-          $Output = GenerateRSS(array
-          (
-            'Title' => $this->System->Config['Web']['Title'].' - '.T('System changes'),
-            'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
-            'Description' => $this->System->Config['Web']['Description'],
-            'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
-            'Items' => $Items,
-          ));
-          return($Output);
-        }
+      '`News`.`Title`, `News`.`Time`, `User`.`Name`, `News`.`Text` '.
+      'FROM `News` JOIN `User` ON `User`.`ID` = `News`.`User` ORDER BY `Time` DESC LIMIT 10');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+     $Items[] = array
+     (
+       'Title' => $DbRow['Title'],
+       'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
+       'Description' => $DbRow['Text'].' ('.$DbRow['Name'].')',
+       'Time' => $DbRow['UnixTime'],
+     );
+    }
+    $Output = GenerateRSS(array
+    (
+      'Title' => $this->System->Config['Web']['Title'].' - '.T('System changes'),
+      'Link' => 'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/news/'),
+      'Description' => $this->System->Config['Web']['Description'],
+      'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
+      'Items' => $Items,
+    ));
+    return($Output);
+  }
 }

trunk/Modules/News/RSS.php

@@ -3 +3 @@
 function GenerateRSS($Data)
 {
-        global $Config;
+  global $Config;
 
-        $Result = '<?xml version="1.0" encoding="'.$Config['Web']['Charset'].'" ?>'."\n". //<?
-                        '<rss version="2.0">'."\n".
-                        "  <channel>\n".
-                        "    <title>".$Data['Title']."</title>\n".
-                        "    <link>".$Data['Link']."</link>\n".
-                        "    <description>".$Data['Description']."</description>\n".
-                        "    <language>cs</language>\n".
-                        "    <webMaster>".$Data['WebmasterEmail']."</webMaster>\n".
-                        "    <pubDate>".date('r')."</pubDate>\n".
-                        "    <ttl>20</ttl>\n";
-        foreach($Data['Items'] as $Item)
-        {
-                $Result .= "    <item>\n".
-                                '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
-                                '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
-                                '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
-                                '      <link>'.$Item['Link']."</link>\n".
-                                "    </item>\n";
-        }
-        $Result .= "  </channel>\n".
-                        "</rss>";
-        return($Result);
+  $Result = '<?xml version="1.0" encoding="'.$Config['Web']['Charset'].'" ?>'."\n". //<?
+      '<rss version="2.0">'."\n".
+      "  <channel>\n".
+      "    <title>".$Data['Title']."</title>\n".
+      "    <link>".$Data['Link']."</link>\n".
+      "    <description>".$Data['Description']."</description>\n".
+      "    <language>cs</language>\n".
+      "    <webMaster>".$Data['WebmasterEmail']."</webMaster>\n".
+      "    <pubDate>".date('r')."</pubDate>\n".
+      "    <ttl>20</ttl>\n";
+  foreach($Data['Items'] as $Item)
+  {
+    $Result .= "    <item>\n".
+        '      <title>'.htmlspecialchars($Item['Title'])."</title>\n".
+        '      <description>'.htmlspecialchars($Item['Description'])."</description>\n".
+        '      <pubDate>'.date('r',$Item['Time'])."</pubDate>\n".
+        '      <link>'.$Item['Link']."</link>\n".
+        "    </item>\n";
+  }
+  $Result .= "  </channel>\n".
+      "</rss>";
+  return($Result);
 }
 
 class PageRSS extends Page
 {
-        function Show()
-        {  
-          $this->RawPage = true;
-          
-          if(array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
-            else $ChannelName = '';
-          if(array_key_exists('token', $_GET)) $Token = $_GET['token'];
-            else $Token = '';
-          if(array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
-          {
-            $Channel = $this->System->ModuleManager->Modules['News']->RSSChannels[$ChannelName];            
-            if($this->System->User->Licence($Channel['Permission']) or 
-            $this->System->User->CheckToken($Channel['Permission'], $Token))
-            {
-            if(is_string($Channel['Callback'][0]))
-              {
-                $Class = new $Channel['Callback'][0]($this->System);
-                $Output = $Class->$Channel['Callback'][1]();
-              } else $Output = call_user_func($Channel['Callback']);
-            } else $Output = T('Access denied');
-          } else $Output = 'Nezadán žádný kanál';
+  function Show()
+  {
+    $this->RawPage = true;
+
+    if(array_key_exists('channel', $_GET)) $ChannelName = $_GET['channel'];
+      else $ChannelName = '';
+    if(array_key_exists('token', $_GET)) $Token = $_GET['token'];
+      else $Token = '';
+    if(array_key_exists($ChannelName, $this->System->ModuleManager->Modules['News']->RSSChannels))
+    {
+      $Channel = $this->System->ModuleManager->Modules['News']->RSSChannels[$ChannelName];
+      if($this->System->User->Licence($Channel['Permission']) or
+      $this->System->User->CheckToken($Channel['Permission'], $Token))
+      {
+        if(is_string($Channel['Callback'][0]))
+        {
+          $Class = new $Channel['Callback'][0]($this->System);
+          $Output = $Class->$Channel['Callback'][1]();
+        } else $Output = call_user_func($Channel['Callback']);
+      } else $Output = T('Access denied');
+    } else $Output = 'Nezadán žádný kanál';
     return($Output);
-        }
+  }
 }

trunk/Modules/Redirection/Redirection.php

@@ -17 +17 @@
   function Start()
   {
-        $this->System->OnPageNotFound = array($this, 'ShowRedirect');
+    $this->System->OnPageNotFound = array($this, 'ShowRedirect');
   }
 
   function Redirect($Location)
   {
-        Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
+    Header($_SERVER['SERVER_PROTOCOL'].' 301 Moved Permanently');
     Header('Location: '.$Location);
     return('<h3 align="center">Požadovaná stránka byla přesunuta do nového umístění.</h3>');
@@ -32 +32 @@
     if(count($this->System->PathItems) > 0)
     {
-        if($this->System->PathItems[0] == 'team.php') $Output = $this->Redirect($this->System->Link('/team/'));
+      if($this->System->PathItems[0] == 'team.php') $Output = $this->Redirect($this->System->Link('/team/'));
       if($this->System->PathItems[0] == 'version.php') $Output = $this->Redirect($this->System->Link('/client-version/'));
       if($this->System->PathItems[0] == 'phpBB3') $Output = $this->Redirect($this->System->Link('/forum/'));

trunk/Modules/Referrer/Referrer.php

@@ -3 +3 @@
 class ModuleReferrer extends AppModule
 {
-        var $Excludes;
+  var $Excludes;
 
   function __construct($System)
@@ -20 +20 @@
   function Start()
   {
-        $this->Log();
-        $this->System->RegisterPage('referrer', 'PageReferrer');
-        $this->System->RegisterMenuItem(array(
-        'Title' => T('Promotion'),
-        'Hint' => 'Informace k propagaci tohoto projektu',
-        'Link' => $this->System->Link('/referrer/'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->Log();
+    $this->System->RegisterPage('referrer', 'PageReferrer');
+    $this->System->RegisterMenuItem(array(
+      'Title' => T('Promotion'),
+      'Hint' => 'Informace k propagaci tohoto projektu',
+      'Link' => $this->System->Link('/referrer/'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ));
   }
@@ -40 +40 @@
       if(!in_array($HostName, $this->Excludes))
       {
-        $IP = GetRemoteAddress();
+        $IP = GetRemoteAddress();
 
         // Check if client IP is not blaclisted as spam source. If yes then add new referrer as invisible
@@ -65 +65 @@
         {
           $this->System->Database->query('INSERT INTO `Referrer` (`Web`, `DateFirst`, `DateLast`, `LastURL`, `Hits`, `LastIP`, `Visible`, `Description`) '.
-                  'VALUES ("'.$HostName.'", NOW(), NOW( ), "'.addslashes($Referrer).'", 1, "'.$IP.'", '.$Visible.', "'.$Description.'")');
+          'VALUES ("'.$HostName.'", NOW(), NOW( ), "'.addslashes($Referrer).'", 1, "'.$IP.'", '.$Visible.', "'.$Description.'")');
         }
       }
@@ -93 +93 @@
     $MonthAge = 3;
     $YesNo = array('Ne', 'Ano');
-                $Output .= '<br/><strong>'.T('Servers referring to us').':</strong> <br />
-        <div style="font-size: 10px;">Seznam je automaticky aktualizován a zobrazeny jsou servery, ze kterých přišli uživatelé během posledních třech měsíců řazený sestupně dle nejnovějších.</div><br />';
-
-        if(!$this->System->User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Visible`=1) AND (`Parent` IS NULL)';
-        else $Where = '';
-        $Query = 'SELECT *, (SELECT Web FROM `Referrer` AS T4 WHERE T4.Id = T3.Parent) AS ParentName '.
-                        'FROM (SELECT *, '.
-                        '(`Hits` + COALESCE((SELECT SUM(`Hits`) FROM '.
-                        '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `TotalHits`, '.
-                        'GREATEST(`DateLast`, COALESCE((SELECT MAX(`DateLast`) FROM '.
-                        '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `MaxDateLast` FROM '.
-                        '`Referrer` AS `T2` '.$Where.') AS `T3` '.
-                        'WHERE (`T3`.`MaxDateLast` > (NOW() - INTERVAL '.$MonthAge.' MONTH))';
-
-
-        $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS T');
-        $DbRow = $DbResult->fetch_row();
-        $PageList = GetPageList($DbRow[0]);
-
-        $Output .= $PageList['Output'].
-        '<table class="BaseTable">';
-
-        $TableColumns = array(
-                        array('Name' => 'Web', 'Title' => T('Address')),
-                        array('Name' => 'MaxDateLast', 'Title' => T('Last visit')),
-                        array('Name' => 'TotalHits', 'Title' => T('Hits')),
-        );
-        if($this->System->User->Licence(LICENCE_ADMIN))
-        {
-                $TableColumns[] = array('Name' => 'Visible', 'Title' => T('Visible'));
-                $TableColumns[] = array('Name' => 'Parent', 'Title' => T('Parent'));
-                $TableColumns[] = array('Name' => 'Description', 'Title' => T('Comment'));
+    $Output .= '<br/><strong>'.T('Servers referring to us').':</strong> <br />
+    <div style="font-size: 10px;">Seznam je automaticky aktualizován a zobrazeny jsou servery, ze kterých přišli uživatelé během posledních třech měsíců řazený sestupně dle nejnovějších.</div><br />';
+
+    if(!$this->System->User->Licence(LICENCE_ADMIN)) $Where = ' WHERE (`Visible`=1) AND (`Parent` IS NULL)';
+    else $Where = '';
+    $Query = 'SELECT *, (SELECT Web FROM `Referrer` AS T4 WHERE T4.Id = T3.Parent) AS ParentName '.
+        'FROM (SELECT *, '.
+        '(`Hits` + COALESCE((SELECT SUM(`Hits`) FROM '.
+        '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `TotalHits`, '.
+        'GREATEST(`DateLast`, COALESCE((SELECT MAX(`DateLast`) FROM '.
+        '`Referrer` AS `T1` WHERE `T1`.`Parent` = `T2`.`Id`), 0)) AS `MaxDateLast` FROM '.
+        '`Referrer` AS `T2` '.$Where.') AS `T3` '.
+        'WHERE (`T3`.`MaxDateLast` > (NOW() - INTERVAL '.$MonthAge.' MONTH))';
+
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS T');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'].
+    '<table class="BaseTable">';
+
+    $TableColumns = array(
+        array('Name' => 'Web', 'Title' => T('Address')),
+        array('Name' => 'MaxDateLast', 'Title' => T('Last visit')),
+        array('Name' => 'TotalHits', 'Title' => T('Hits')),
+    );
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $TableColumns[] = array('Name' => 'Visible', 'Title' => T('Visible'));
+      $TableColumns[] = array('Name' => 'Parent', 'Title' => T('Parent'));
+      $TableColumns[] = array('Name' => 'Description', 'Title' => T('Comment'));
       $TableColumns[] = array('Name' => 'LastIP', 'Title' => T('Last IP address'));
-                $TableColumns[] = array('Name' => 'Action', 'Title' => T('Actions'));
-        }
-        $Order = GetOrderTableHeader($TableColumns, 'MaxDateLast', 1);
-        $Output .= $Order['Output'];
-
-        $Query .= $Order['SQL'].$PageList['SQLLimit'];
-
-        $DbResult = $this->Database->query($Query);
-        while($Line = $DbResult->fetch_assoc())
-        {
-                $Output .= '<tr><td><a href="'.$Line['LastURL'].'">'.$Line['Web'].'</a></td>'.
-                                '<td>'.HumanDate($Line['MaxDateLast']).'</td>'.
-                                '<td>'.$Line['TotalHits'].'</td>';
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                        $Output .=
-                        '<td>'.$YesNo[$Line['Visible']].'</td>'.
-                        '<td>'.$Line['ParentName'].'</td>'.
-                        '<td>'.$Line['Description'].'</td>'.
+      $TableColumns[] = array('Name' => 'Action', 'Title' => T('Actions'));
+    }
+    $Order = GetOrderTableHeader($TableColumns, 'MaxDateLast', 1);
+    $Output .= $Order['Output'];
+
+    $Query .= $Order['SQL'].$PageList['SQLLimit'];
+
+    $DbResult = $this->Database->query($Query);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $Output .= '<tr><td><a href="'.$Line['LastURL'].'">'.$Line['Web'].'</a></td>'.
+          '<td>'.HumanDate($Line['MaxDateLast']).'</td>'.
+          '<td>'.$Line['TotalHits'].'</td>';
+      if($this->System->User->Licence(LICENCE_ADMIN))
+      {
+        $Output .=
+        '<td>'.$YesNo[$Line['Visible']].'</td>'.
+        '<td>'.$Line['ParentName'].'</td>'.
+        '<td>'.$Line['Description'].'</td>'.
         '<td>'.$Line['LastIP'].'</td>'.
-                        '<td><a href="?action=edit&amp;id='.$Line['Id'].'">'.T('Modify').'</a> '.
+        '<td><a href="?action=edit&amp;id='.$Line['Id'].'">'.T('Modify').'</a> '.
         '<a href="?action=spam&amp;id='.$Line['Id'].'">'.T('Spam').'</a></td>';
-                }
-                $Output .= '</tr>';
-        }
-        $Output .= '</table>';
-        $Output .= $PageList['Output'];
-        return($Output);
+      }
+      $Output .= '</tr>';
+    }
+    $Output .= '</table>';
+    $Output .= $PageList['Output'];
+    return($Output);
   }
 
@@ -203 +203 @@
   {
     if($this->System->User->Licence(LICENCE_ADMIN))
-          {
-                if(array_key_exists('id', $_GET))
-                {
+    {
+      if(array_key_exists('id', $_GET))
+      {
         $DbResult = $this->Database->select('Referrer', '*', 'Id='.$_GET['id']);
-              if($DbResult->num_rows > 0)
-              {
-                      $Item = $DbResult->fetch_assoc();
-                      if($Item['Visible'] == 1) $Visible = ' checked ';
-                      else $Visible = '';
-                $Output = '<form action="?action=editsave&amp;id='.$_GET['id'].'" method="post"><table>'.
-                  '<tr><td>'.T('Web').'</td><td>'.$Item['Web'].'</td></tr>'.
-                        '<tr><td>'.T('Visible').'</td><td><input type="checkbox" name="Visible" '.$Visible.'/></td></tr>'.
-                        '<tr><td>'.T('Description').'</td><td><input type="text" name="Description" value="'.$Item['Description'].'"/></td></tr>'.
-                  '<tr><td>'.T('Parent item').'</td><td>'.$this->SelectParentItem($Item['Parent'], $Item['Id']).'</td></tr>'.
+        if($DbResult->num_rows > 0)
+        {
+          $Item = $DbResult->fetch_assoc();
+          if($Item['Visible'] == 1) $Visible = ' checked ';
+            else $Visible = '';
+          $Output = '<form action="?action=editsave&amp;id='.$_GET['id'].'" method="post"><table>'.
+            '<tr><td>'.T('Web').'</td><td>'.$Item['Web'].'</td></tr>'.
+            '<tr><td>'.T('Visible').'</td><td><input type="checkbox" name="Visible" '.$Visible.'/></td></tr>'.
+            '<tr><td>'.T('Description').'</td><td><input type="text" name="Description" value="'.$Item['Description'].'"/></td></tr>'.
+            '<tr><td>'.T('Parent item').'</td><td>'.$this->SelectParentItem($Item['Parent'], $Item['Id']).'</td></tr>'.
             '<tr><td>'.T('Last IP address').'</td><td><input type="text" name="LastIP" value="'.$Item['LastIP'].'"/></td></tr>'.
-                  '<tr><td colspan="2"><input type="submit" value="Uložit"/></td></tr></table></form>';
-              } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
-            } else $Output = ShowMessage(T('Item not specified'), MESSAGE_CRITICAL);
-          } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-          return($Output);
+            '<tr><td colspan="2"><input type="submit" value="Uložit"/></td></tr></table></form>';
+        } else $Output = ShowMessage(T('Item not found'), MESSAGE_CRITICAL);
+      } else $Output = ShowMessage(T('Item not specified'), MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
   }
 
   function EditSave()
   {
-          if($this->System->User->Licence(LICENCE_ADMIN))
-          {
-                  if($_POST['Parent'] == '') $_POST['Parent'] = null;
-                  $_POST['Visible'] = array_key_exists('Visible', $_POST);
-            $DbResult = $this->Database->update('Referrer', 'Id='.$_GET['id'], array(
-                  'Visible' => $_POST['Visible'], 'LastIP' => $_POST['LastIP'],
-                  'Parent' => $_POST['Parent'], 'Description' => $_POST['Description']));
-            $_SERVER['QUERY_STRING'] = '';
-            $Output = ShowMessage(T('Settings saved'));
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      if($_POST['Parent'] == '') $_POST['Parent'] = null;
+      $_POST['Visible'] = array_key_exists('Visible', $_POST);
+      $DbResult = $this->Database->update('Referrer', 'Id='.$_GET['id'], array(
+        'Visible' => $_POST['Visible'], 'LastIP' => $_POST['LastIP'],
+        'Parent' => $_POST['Parent'], 'Description' => $_POST['Description']));
+      $_SERVER['QUERY_STRING'] = '';
+      $Output = ShowMessage(T('Settings saved'));
       $Output .= $this->ShowList();
-          } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-          return($Output);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
   }
 
   function Show()
   {
-        $this->Title = T('Promotion');
+    $this->Title = T('Promotion');
     if(array_key_exists('action', $_GET))
     {

trunk/Modules/Search/Search.php

@@ -3 +3 @@
 class ModuleSearch extends AppModule
 {
-        var $SearchItems;
-        
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'Search';
-                $this->Version = '1.0';
-                $this->Creator = 'Chronos';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'Allow test search in other modules content.';
-                $this->Dependencies = array();
-                $this->SearchItems = array();
-        }
+  var $SearchItems;
 
-        function Start()
-        {
-                $this->System->RegisterPage('search', 'PageSearch');
-        }
-        
-        function RegisterSearch($Name, $Title, $Columns, $Query, $Link)
-        {
-                // Query can be table name or subselect query
-          $this->SearchItems[$Name] = array('Name' => $Title, 'Columns' => $Columns, 
-      'Query' => $Query, 'Link' => $Link);      
-        }
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Search';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Allow test search in other modules content.';
+    $this->Dependencies = array();
+    $this->SearchItems = array();
+  }
 
-        function UnregisterSearch($Name)
-        {
-          unset($this->SearchItems[$Name]);     
-        }
+  function Start()
+  {
+    $this->System->RegisterPage('search', 'PageSearch');
+  }
+
+  function RegisterSearch($Name, $Title, $Columns, $Query, $Link)
+  {
+    // Query can be table name or subselect query
+    $this->SearchItems[$Name] = array('Name' => $Title, 'Columns' => $Columns,
+      'Query' => $Query, 'Link' => $Link);
+  }
+
+  function UnregisterSearch($Name)
+  {
+    unset($this->SearchItems[$Name]);
+  }
 }
 
 class PageSearch extends Page
 {
-        function Show()
-        {
-                $this->Title = T('Search');
-                if(array_key_exists('text', $_GET)) $Search = $_GET['text'];
-                else if(array_key_exists('text', $_POST)) $Search = $_POST['text'];
-                else $Search = '';
-                $SearchHTML = urlencode($Search);
-                
-                $Output = '<table class="BaseTable"><tr><th>'.T('Section').'</th><th>'.T('Found count').'</th></tr>';
-                foreach($this->System->ModuleManager->Modules['Search']->SearchItems as $SearchItem)
-                {
-                        $ColumnQuery = array();
-                        foreach($SearchItem['Columns'] as $Column)
-                        {
-                          $ColumnQuery[] = '(`'.$Column.'` LIKE "%'.$Search.'%")';
-                  } 
-                  $ColumnQuery = implode(' OR ', $ColumnQuery);
-                  if($SearchItem['Query'] != '')
-                  {                      
-                    $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$SearchItem['Query'].' WHERE '.$ColumnQuery);
-                  $Line = $DbResult->fetch_row();
-                  $Line = $Line[0];
-                  } else $Line = '';
+  function Show()
+  {
+    $this->Title = T('Search');
+    if(array_key_exists('text', $_GET)) $Search = $_GET['text'];
+    else if(array_key_exists('text', $_POST)) $Search = $_POST['text'];
+    else $Search = '';
+    $SearchHTML = urlencode($Search);
+
+    $Output = '<table class="BaseTable"><tr><th>'.T('Section').'</th><th>'.T('Found count').'</th></tr>';
+    foreach($this->System->ModuleManager->Modules['Search']->SearchItems as $SearchItem)
+    {
+      $ColumnQuery = array();
+      foreach($SearchItem['Columns'] as $Column)
+      {
+        $ColumnQuery[] = '(`'.$Column.'` LIKE "%'.$Search.'%")';
+      }
+      $ColumnQuery = implode(' OR ', $ColumnQuery);
+      if($SearchItem['Query'] != '')
+      {
+        $DbResult = $this->Database->query('SELECT COUNT(*) FROM '.$SearchItem['Query'].' WHERE '.$ColumnQuery);
+        $Line = $DbResult->fetch_row();
+        $Line = $Line[0];
+      } else $Line = '';
       if ($Line <> 0)
-                  $Output .= '<tr><td><a href="'.$SearchItem['Link'].$SearchHTML.'">'.$SearchItem['Name'].'</a></td><td>'.$Line.'</td></tr>';
-                }
-  
-        $Output .= '</table>';
-                return($Output);
-        }
+        $Output .= '<tr><td><a href="'.$SearchItem['Link'].$SearchHTML.'">'.$SearchItem['Name'].'</a></td><td>'.$Line.'</td></tr>';
+    }
+
+    $Output .= '</table>';
+    return($Output);
+  }
 }

trunk/Modules/Server/Server.php

@@ -3 +3 @@
 class ModuleServer extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'Server';
-                $this->Version = '1.0';
-                $this->Creator = 'Chronos';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'Show list of WoW servers which supports translated texts.';
-                $this->Dependencies = array();
-        }
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'Server';
+    $this->Version = '1.0';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'Show list of WoW servers which supports translated texts.';
+    $this->Dependencies = array();
+  }
 
-        function Start()
-        {
-                $this->System->RegisterPage('server', 'PageServerList');
-                $this->System->RegisterMenuItem(array(
+  function Start()
+  {
+    $this->System->RegisterPage('server', 'PageServerList');
+    $this->System->RegisterMenuItem(array(
       'Title' => T('Servers'),
       'Hint' => 'Seznam serverů, kde je nasazena čeština v praxi',
@@ -24 +24 @@
       'Icon' => '',
     ), 5);
-        }
+  }
 }
 
 class PageServerList extends PageEdit
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-          $this->Table = 'Server';
-          $this->TableSQL = 'SELECT `Server`.`Id`, `Name`, `URL`, `Parts`, `XPRate`, `GameplayStyle`, `Description`, `CheckIP`, `CheckPort`, '.
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Table = 'Server';
+    $this->TableSQL = 'SELECT `Server`.`Id`, `Name`, `URL`, `Parts`, `XPRate`, `GameplayStyle`, `Description`, `CheckIP`, `CheckPort`, '.
       '`ClientVersion`.`Version` AS `ClientVersion` FROM `Server` '.
       'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `Server`.`ClientVersion`';
-          $this->Definition = array(
-            'Name' => array('Type' => 'String', 'Title' => T('Name'), 'InList' => true),
-      'URL' => array('Type' => 'URL', 'Title' => T('URL'), 'InList' => true), 
-      'Parts' => array('Type' => 'String', 'Title' => T('Translated'), 'InList' => true), 
+    $this->Definition = array(
+      'Name' => array('Type' => 'String', 'Title' => T('Name'), 'InList' => true),
+      'URL' => array('Type' => 'URL', 'Title' => T('URL'), 'InList' => true),
+      'Parts' => array('Type' => 'String', 'Title' => T('Translated'), 'InList' => true),
       'XPRate' => array('Type' => 'String', 'Title' => T('XP rate'), 'InList' => true),
       'GameplayStyle' => array('Type' => 'String', 'Title' => T('Style'), 'InList' => true),
-      'ClientVersion' => array('Type' => 'String', 'Title' => T('Client version'), 'InList' => true),      
+      'ClientVersion' => array('Type' => 'String', 'Title' => T('Client version'), 'InList' => true),
       'Description' => array('Type' => 'Text', 'Title' => T('Description'), 'InList' => false),
       'CheckIP' => array('Type' => 'Text', 'Title' => T('Online check IP'), 'InList' => false),
       'CheckPort' => array('Type' => 'Text', 'Title' => T('Online check port'), 'InList' => false),
-          );            
-        }
-        
-        function ViewList()
-        {
-                $this->Title = T('Servers');
+    );
+  }
+
+  function ViewList()
+  {
+    $this->Title = T('Servers');
     $Output = '<p>'.T('There are servers listed which are in fact offering translated game. '.
     'There is resoluted if translation is offered either on client side, on server side or both. '.
     'Term "Czech server" doesn\'t mean that server is operated by Czech people but that it is possible to play in Czech.').'.</p>';
     $Output .= '<h3>'.T('Translated server list').'</h3>';
-                $Output .= parent::ViewList();
-                return($Output);
-        }
+    $Output .= parent::ViewList();
+    return($Output);
+  }
 }

trunk/Modules/ShoutBox/ShoutBox.php

@@ -16 +16 @@
   function Start()
   {
-        $this->System->RegisterPage('shoutbox', 'PageShoutBox');
-        $this->System->ModuleManager->Modules['News']->RegisterRSS(array(
-          'Title' => T('Shoutbox'), 'Channel' => 'shoutbox', 'Callback' => array('PageShoutBox', 'ShowRSS'),
-          'Permission' => LICENCE_ANONYMOUS));
+    $this->System->RegisterPage('shoutbox', 'PageShoutBox');
+    $this->System->ModuleManager->Modules['News']->RegisterRSS(array(
+      'Title' => T('Shoutbox'), 'Channel' => 'shoutbox', 'Callback' => array('PageShoutBox', 'ShowRSS'),
+      'Permission' => LICENCE_ANONYMOUS));
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('shoutbox',
@@ -27 +27 @@
   function ShowBox()
   {
-        $Output = '<strong><a href="'.$this->System->Link('/shoutbox/').'">'.T('Shoutbox').':</a></strong>';
-         
-        if($this->System->User->Licence(LICENCE_USER))
-                $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
-        $Output .= '<div class="box"><table>';
-        $DbResult = $this->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
-        while($Line = $DbResult->fetch_assoc())
-                $Output .= '<tr><td><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
-        $Output .= '</table></div>';
-        return($Output);
+    $Output = '<strong><a href="'.$this->System->Link('/shoutbox/').'">'.T('Shoutbox').':</a></strong>';
+
+    if($this->System->User->Licence(LICENCE_USER))
+      $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
+    $Output .= '<div class="box"><table>';
+    $DbResult = $this->Database->query('SELECT * FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 30');
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<tr><td><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</td></tr>';
+    $Output .= '</table></div>';
+    return($Output);
   }
 }
@@ -42 +42 @@
 class PageShoutBox extends Page
 {
-        function Show()
-        {
-                $this->Title = T('Shoutbox');
-                if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
-                  else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
-                  else $Action = '';
-                if($Action == 'add2') $Output = $this->AddFinish();
-                if($Action == 'add') $Output = $this->ShowAddForm();
-                else $Output = $this->ShowList();
-                return($Output);
-        }
+  function Show()
+  {
+    $this->Title = T('Shoutbox');
+    if(array_key_exists('a', $_POST)) $Action = $_POST['a'];
+      else if(array_key_exists('a', $_GET)) $Action = $_GET['a'];
+      else $Action = '';
+    if($Action == 'add2') $Output = $this->AddFinish();
+    if($Action == 'add') $Output = $this->ShowAddForm();
+    else $Output = $this->ShowList();
+    return($Output);
+  }
 
-        function ShowList()
-        {
-                $Output = '';
-                if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-                if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-                if($_SESSION['search'] != '')
-                {
-                        $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
-                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
-                } else $SearchQuery = '';
+  function ShowList()
+  {
+    $Output = '';
+    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if($_SESSION['search'] != '')
+    {
+      $SearchQuery = ' AND (`Text` LIKE "%'.$_SESSION['search'].'%")';
+      $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+    } else $SearchQuery = '';
 
-        $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ShoutBox` WHERE 1'.$SearchQuery);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);     
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `ShoutBox` WHERE 1'.$SearchQuery);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
 
-                $Output .= '<h3>'.T('Shoutbox').'</h3>'.$PageList['Output'];
-                if($this->System->User->Licence(LICENCE_USER))
-                        $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
-                $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT * FROM `ShoutBox`  WHERE 1'.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc())
-                        $Output .= '<div><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</div>';
-                $Output .= '</div>'.$PageList['Output'];
-                return($Output);
-        }
+    $Output .= '<h3>'.T('Shoutbox').'</h3>'.$PageList['Output'];
+    if($this->System->User->Licence(LICENCE_USER))
+      $Output .= ' <a href="'.$this->System->Link('/shoutbox/?a=add').'">'.T('Add').'</a>';
+    $Output .= '<div class="shoutbox">';
+    $DbResult = $this->System->Database->query('SELECT * FROM `ShoutBox`  WHERE 1'.$SearchQuery.' ORDER BY `ID` DESC '.$PageList['SQLLimit']);
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<div><strong>'.$Line['UserName'].'</strong>: '.MakeActiveLinks($Line['Text']).'</div>';
+    $Output .= '</div>'.$PageList['Output'];
+    return($Output);
+  }
 
-        function ShowAddForm()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                                $Output .= '<form action="?" method="post">'.
-                                                '<fieldset><legend>'.T('New message').'</legend>'.
-                                                'Uživatel: ';
-                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
-                                else $Output .= '<input type="text" name="user" /><br />';
-                        $Output .= 'Text zprávy: <br/>'.
-                        '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="40"></textarea> <br/>'.
-                        '<input type="hidden" name="a" value="add2"/>'.
-                        '<input type="submit" value="Odeslat" /><br /></fieldset>'.
-                        '</form>';
-                }       else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
-                $Output .= $this->ShowList();
-          return($Output);
-        }
+  function ShowAddForm()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+        $Output .= '<form action="?" method="post">'.
+            '<fieldset><legend>'.T('New message').'</legend>'.
+            'Uživatel: ';
+        if($this->System->User->Licence(LICENCE_USER)) $Output .= '<b>'.$this->System->User->Name.'</b><br />';
+        else $Output .= '<input type="text" name="user" /><br />';
+      $Output .= 'Text zprávy: <br/>'.
+      '<textarea onkeydown="ResizeTextArea(this)" name="text" cols="40"></textarea> <br/>'.
+      '<input type="hidden" name="a" value="add2"/>'.
+      '<input type="submit" value="Odeslat" /><br /></fieldset>'.
+      '</form>';
+    } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
+    $Output .= $this->ShowList();
+    return($Output);
+  }
 
-        function AddFinish()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('text', $_POST))
-                        {
-                                $Text = $_POST['text'];
-                                if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
-                                else
-                                {
-                                        // Protection against mutiple post of same message
-                                        $DbResult = $this->System->Database->query('SELECT `Text` FROM `ShoutBox` WHERE (`User` = "'.
-                                                        $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
-                                        if($DbResult->num_rows > 0)
-                                        {
-                                                $DbRow = $DbResult->fetch_assoc();
-                                        } else $DbRow['Text'] = '';
-                        
-                                        if($DbRow['Text'] == $Text) $Output .= ShowMessage('Nelze vložit stejnou zprávu vícekrát za sebou.', MESSAGE_WARNING);
-                                        else
-                                        {
-                                                $this->System->Database->query('INSERT INTO `ShoutBox` ( `User`, `UserName` , `Text` , `Date` , `IP` ) '.
-                                                                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
-                                                                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'")');
-                                                $Output .= ShowMessage('Zpráva vložena.');
-                                        }
-                                }
-                        } else $Output .= ShowMessage('Nezadán text pro novou zprávu.', MESSAGE_CRITICAL);                              
-                        $Output .= '<br/>';
-                } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
-                $Output .= $this->ShowList();
-                return($Output);
-        }
+  function AddFinish()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('text', $_POST))
+      {
+        $Text = $_POST['text'];
+        if(trim($Text) == '') $Output .= ShowMessage('Nelze vložit prázdnou zprávu.', MESSAGE_WARNING);
+        else
+        {
+          // Protection against mutiple post of same message
+          $DbResult = $this->System->Database->query('SELECT `Text` FROM `ShoutBox` WHERE (`User` = "'.
+              $this->System->User->Id.'") ORDER BY `Date` DESC LIMIT 1');
+          if($DbResult->num_rows > 0)
+          {
+            $DbRow = $DbResult->fetch_assoc();
+          } else $DbRow['Text'] = '';
 
-        function ShowRSS()
-        {
-                $Items = array();
-          $TitleLength = 50;
-          mb_internal_encoding('utf-8');
-          $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `UserName`, `Text` FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
-          while($DbRow = $DbResult->fetch_assoc())
-          {
-            $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
-            if(mb_strlen($Title) == $TitleLength) $Title .= '...';
-            $Items[] = array
-            (
-                'Title' => $DbRow['UserName'].': '.$Title,
-                'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/shoutbox/'),
-                'Description' => $DbRow['Text'],
-                'Time' => $DbRow['UnixDate'],
-            );
-          }
-          $Output = GenerateRSS(array
+          if($DbRow['Text'] == $Text) $Output .= ShowMessage('Nelze vložit stejnou zprávu vícekrát za sebou.', MESSAGE_WARNING);
+          else
+          {
+            $this->System->Database->query('INSERT INTO `ShoutBox` ( `User`, `UserName` , `Text` , `Date` , `IP` ) '.
+                ' VALUES ('.$this->System->User->Id.', "'.$this->System->User->Name.
+                '", "'.$Text.'", NOW(), "'.GetRemoteAddress().'")');
+            $Output .= ShowMessage('Zpráva vložena.');
+          }
+        }
+      } else $Output .= ShowMessage('Nezadán text pro novou zprávu.', MESSAGE_CRITICAL);
+      $Output .= '<br/>';
+    } else $Output .= ShowMessage('Pro vkládaní zpráv musíte byt registrováni.', MESSAGE_CRITICAL);
+    $Output .= $this->ShowList();
+    return($Output);
+  }
+
+  function ShowRSS()
+  {
+    $Items = array();
+    $TitleLength = 50;
+    mb_internal_encoding('utf-8');
+    $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `UnixDate`, `User`, `UserName`, `Text` FROM `ShoutBox` ORDER BY `ID` DESC LIMIT 20');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $Title = mb_substr($DbRow['Text'], 0, $TitleLength);
+      if(mb_strlen($Title) == $TitleLength) $Title .= '...';
+      $Items[] = array
+      (
+          'Title' => $DbRow['UserName'].': '.$Title,
+          'Link' =>  'http://'.$this->System->Config['Web']['Host'].$this->System->Link('/shoutbox/'),
+          'Description' => $DbRow['Text'],
+          'Time' => $DbRow['UnixDate'],
+      );
+    }
+    $Output = GenerateRSS(array
     (
       'Title' => $this->System->Config['Web']['Title'].' - '.T('Shoutbox'),
@@ -163 +163 @@
     ));
     return($Output);
-        }
+  }
 }

trunk/Modules/Team/Team.php

@@ -13 +13 @@
     $this->Dependencies = array('User');
   }
-  
+
   function Start()
   {
-        $this->System->RegisterPage('team', 'PageTeam');
-        $this->System->RegisterMenuItem(array(
+    $this->System->RegisterPage('team', 'PageTeam');
+    $this->System->RegisterMenuItem(array(
       'Title' => T('Teams'),
-      'Hint' => T('List of translating teams'), 
+      'Hint' => T('List of translating teams'),
       'Link' => $this->System->Link('/team/'),
-      'Permission' => LICENCE_ANONYMOUS, 
-      'Icon' => '', 
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 1);
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
@@ -34 +34 @@
 class PageTeam extends Page
 {
-        function ShowTeamList()
-        {
-                $this->Title = T('Teams');
-                $Output = '<h3>'.T('List of translating teams').'</h3>';
-                $Output .= 'Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>';
+  function ShowTeamList()
+  {
+    $this->Title = T('Teams');
+    $Output = '<h3>'.T('List of translating teams').'</h3>';
+    $Output .= 'Týmy jsou seskupení překladatelů, kteří se hlásí k něčemu společnému jako např. WoW serveru, způsobu překladu, ke stejnému hernímu spolku, aj. Být členem týmu samo o sobě nemá žádný zásadní důsledek a spíše to může pomoci se lépe orientovat mezi překladateli někomu, kdo sestavuje export.<br/>';
 
     if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-                if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-        
-          if($this->System->User->Licence(LICENCE_USER))
-                  $Output .= '<br /><div style="text-align: center;"><a href="?action=create">'.T('Create translating team').'</a></div><br/>';
-                if($_SESSION['search'] != '')
-                {
-                        $SearchQuery = ' AND ((`Name` LIKE "%'.$_SESSION['search'].'%") OR (`Description` LIKE "%'.$_SESSION['search'].'%"))'; 
-                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
-                } else $SearchQuery = '';               
-                
-          $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE 1'.$SearchQuery);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $Output .= $PageList['Output'];
-                $Output .= '<table class="BaseTable">';
-        
-                $TableColumns = array(
-                                array('Name' => 'Name', 'Title' => T('Name')),
-                                array('Name' => 'URL', 'Title' => T('Web pages')),
-                                array('Name' => 'LeaderName', 'Title' => T('Leader')),
-                                array('Name' => 'NumberUser', 'Title' => T('Member count')),
-                                array('Name' => 'TimeCreate', 'Title' => T('Founding date')),
-                );
-                if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('User actions'));
-        
-                $Order = GetOrderTableHeader($TableColumns, 'NumberUser', 1);
-                $Output .= $Order['Output'];    
-        
-                $DbResult = $this->Database->query('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) AS `NumberUser`, '.
-                        '(SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` '.
-                        'FROM `Team` WHERE 1'.$SearchQuery.$Order['SQL'].$PageList['SQLLimit']);
-                while($Team = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<tr>'.
-                                        '<td><a href="?action=team&amp;id='.$Team['Id'].'">'.$Team['Name'].'</a></td>'.
-                                        '<td><a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a></td>'.
-                                        '<td><a href="'.$this->System->Link('/user.php?user='.$Team['Leader']).'">'.$Team['LeaderName'].'</a></td>'.
-                                        '<td><a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
-                                        '<td>'.HumanDate($Team['TimeCreate']).'</td>';
-                        if($this->System->User->Licence(LICENCE_USER))
-                        {
-                                if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
-                                else $Action = '';
-                                if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
-                                $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit</a>'.$Action.'</td>';
-                        }
-                        $Output .= '</tr>';
-                }
-                $Output .= '</table>'.
-                                $PageList['Output'];
-        
-                return($Output);
-        }
-        
-        function TeamJoin()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('id', $_GET))
-                        {
-                                $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
-                                $Output = ShowMessage('Vstoupil jsi do týmu.');
-                                $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
-        
-                                // Delete all teams without users
-                                $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
-        
-                                // Set new leader for teams where old leader went to other team
-                                $this->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
-        
-                                $Output .= $this->ShowTeamList();
-                        } else $Output = ShowMessage('Nutno zadat id týmu.', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function TeamCreateFinish()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
-                        {
-                                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');
-                                $DbRow = $DbResult->fetch_row();
-                                $Count = $DbRow[0];
-                                if(($Count == 0) and ($_POST['Name'] != ''))
-                                {
-                                        $this->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`, `Leader`)'.
-                                                        ' VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.
-                                                        $_POST['URL'].'", NOW(), '.$this->System->User->Id.')');
-                                        $this->Database->query('UPDATE `User` SET `Team` = '.$this->Database->insert_id.' WHERE `ID` = '.$this->System->User->Id);
-                                        $Output .= ShowMessage('Překladatelský tým vytvořen.');
-                                        $this->System->ModuleManager->Modules['Log']->WriteLog('Překladatelský tým vytvořen '.$_POST['Name'], LOG_TYPE_USER);
-        
-                                        // Delete all teams without users
-                                        $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
-                                } else $Output .= ShowMessage('Již existuje tým se stejným jménem', MESSAGE_CRITICAL);
-                        } else $Output .= ShowMessage('Chybí údaje formuláře', MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                $Output .= $this->ShowTeamList();
-                return($Output);
-        }
-        
-        function TeamModify()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('id', $_GET))
-                        {
-                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
-                                if($DbResult->num_rows > 0)
-                                {
-                                        $Team = $DbResult->fetch_assoc();
-                                        $Output = '<form action="?action=finish_modify&amp;id='.$_GET['id'].'" method="post">'.
-                                                        '<fieldset><legend>Nastavení týmu</legend>'.
-                                                        '<table><tr><td>Jméno:</td><td><input type="text" name="Name" value="'.$Team['Name'].'"/></td></tr>'.
-                                                        '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value="'.$Team['URL'].'"/></td></tr>'.
-                                                        '<tr><td>Popis:</td><td><input type="text" name="Description" value="'.$Team['Description'].'"/></td></tr>'.
-                                                        '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
-                                                        '</table></fieldset></form>';
-                                } else $Output = ShowMesage('Tým nenalezen.', MESSAGE_CRITICAL);
-                        } else $Output = ShowMessage('Nezadáno id týmu', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function TeamModifyFinish()
-        {
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
-                        {
-                                $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
-                                if($DbResult->num_rows > 0)
-                                {
-                                        $Team = $DbResult->fetch_assoc();
-                                        $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');
-                                        $DbRow = $DbResult->fetch_row();
-                                        $Count = $DbRow[0];
-                                        if(($Count == 0) and ($_POST['Name'] != ''))
-                                        {
-                                                $this->Database->query('UPDATE `Team` SET `Name`="'.$_POST['Name'].'", `Description`="'.$_POST['Description'].'", `URL`="'.$_POST['URL'].'" WHERE Id='.$Team['Id']);
-                                                $Output .= ShowMessage('Nastavení týmu uloženo.');
-                                                $this->System->ModuleManager->Modules['Log']->WriteLog('Překladatelský tým upraven '.$_POST['Name'], LOG_TYPE_USER);
-                                        } else $Output .= ShowMessage('Již existuje tým se stejným jménem.', MESSAGE_CRITICAL);
-                                } else $Output .= ShowMessage('Tým nenalezen nebo nemáte oprávnění.', MESSAGE_CRITICAL);
-                        } else $Output .= ShowMessage('Nezadáno id týmu nebo některé položky formuláře.', MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                $Output .= $this->ShowTeamList();
-                return($Output);
-        }
-        
-        function TeamCreate()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        $Output ='<form action="?action=finish_create" method="post">'.
-                                        '<fieldset><legend>Vytvoření nového týmu</legend>'.
-                                        '<table><tr><td>Jméno:</td><td><input type="text" name="Name" /></td></tr>'.
-                                        '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value=""/></td></tr>'.
-                                        '<tr><td>Popis:</td><td><input type="text" name="Description" /></td></tr>'.
-                                        '<tr><td colspan="2"><input type="submit" value="Vytvořit a vstoupit" /></td></tr>'.
-                                        '</table></fieldset></form>';
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function TeamShow()
-        {
-                $Output = '';
-                if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
-                {
-                        ImgLevelUpdate();
-        
-                        $DbResult = $this->Database->query('SELECT `Id`, `Name`, `Description`, `URL`, `Leader`, '.
-                                        '(SELECT COUNT(*) FROM `User` WHERE '.
-                                        '`Team` = `Team`.`Id`) AS `NumberUser`, (SELECT SUM(`TranslatedCount`) FROM `User` WHERE '.
-                                        '`Team` = `Team`.`Id`) AS `NumberTranslate` FROM '.
-                                        '`Team` WHERE `Id`='.($_GET['id'] * 1));
-                        if($DbResult->num_rows > 0)
-                        {
-                                $Team = $DbResult->fetch_assoc();
-                                $DbResult2 = $this->Database->query('SELECT `Name`, `Id` FROM `User` WHERE `ID`='.$Team['Leader']);
-                                if($DbResult2->num_rows > 0)
-                                {
-                                        $Leader = $DbResult2->fetch_assoc();
-                                } else $Leader = array('Name' => '', 'Id' => 0);
-        
-                                $Output .='<strong>Překladatelský tým '.$Team['Name'].'</strong><br />'.
-                                                'Webové stránky: <a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a><br/>'.
-                                                'Vedoucí: <a href="'.$this->System->Link('/user.php?user='.$Leader['Id']).'">'.$Leader['Name'].'</a><br/>'.
-                                                'Popis: '.$Team['Description'].'<br /><br />';
-                                //$Output .= '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ';
-                                if($this->System->User->Licence(LICENCE_USER))
-                                        $Output .='<a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit do týmu</a><br /><br />';
-                                $Output .='<fieldset><legend>Statistika</legend>'.
-                                                'Počet členů týmu: <a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a><br />'.
-                                                'Počet přeložených textů týmu: <strong>'.$Team['NumberTranslate'].'</strong><br />'.
-                                                'Průměrná úroveň překladatelů v týmu: <img src="'.$this->System->Link('/tmp/team/'.$Team['Name'].'/level.png').'" /><br /><br />'.
-                                                '<strong>Stav dokončení týmu pro verzi '.$this->System->Config['Web']['GameVersion'].'</strong><br />';
-        
-                                $BuildNumber = GetBuildNumber($this->System->Config['Web']['GameVersion']);
-        
-                                $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
-                                $Query = '';
-                                $DbResult = $this->Database->query($GroupListQuery);
-                                if($DbResult->num_rows > 0)
-                                {
-                                        while($DbRow = $DbResult->fetch_assoc())
-                                        {
-                                                $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-                                                                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-                                                                'WHERE (`User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.$Team['Id'].')) '.
-                                                                'AND (`Complete` = 1) AND (`T`.`Language`!='.$this->System->Config['OriginalLanguage'].') '.
-                                                                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-                                                                ') AS `C1`) AS `Translated`, '.
-                                                                '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-                                                                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
-                                                                'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
-                                                                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
-                                                                ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
-                                        }
-                                        $Query = substr($Query, 0, - 6);
-        
-                                        $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
-                                        $DbRow = $DbResult->fetch_row();
-                                        $PageList = GetPageList($DbRow[0]);
-                                        $Output .= $PageList['Output'];
-        
-                                        $Output .='<table class="BaseTable">';
-                                        $TableColumns = array(
-                                                        array('Name' => 'Name', 'Title' => 'Jméno'),
-                                                        array('Name' => 'Translated', 'Title' => 'Přeložených'),
-                                                        array('Name' => 'Total', 'Title' => 'Anglických'),
-                                                        array('Name' => 'Percent', 'Title' => 'Procenta'),
-                                        );
-        
-                                        $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
-                                        $Output .= $Order['Output'];
-        
-                                        $Translated = 0;
-                                        $Total = 0;
-                                        $DbResult = $this->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
-                                        while($Group = $DbResult->fetch_assoc())
-                                        {
-                                                $Output .='<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
-                                                $Translated += $Group['Translated'];
-                                                $Total += $Group['Total'];
-                                        }
-                                        if($Total > 0) $Progress = round($Translated / $Total * 100, 2);
-                                        else $Progress = 0;
-                                        $Output .='<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $Progress).'</strong></td></tr>';
-                                        $Output .='</table>';
-                                }
-                                $Output .='</fieldset>';
-                        } else $Output .= ShowMessage('Tým nenalezen', MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage('Musíte zadat id týmu', MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function TeamLeave()
-        {
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
-                        $Output = ShowMessage('Nyní nejste členem žádného týmu.');
-                        $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
-        
-                        // Delete all teams without users
-                        $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
-        
-                        // Set new leader for teams where old leader went to other team
-                        $this->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
-        
-                        $Output .= $this->ShowTeamList();
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function Show()
-        {
-                if(array_key_exists('action', $_GET))
-                {
-                        if($_GET['action'] == 'gointeam') $Output = $this->TeamJoin();
-                        else if($_GET['action'] == 'finish_create') $Output = $this->TeamCreateFinish();
-                        else if($_GET['action'] == 'modify') $Output = $this->TeamModify();
-                        else if($_GET['action'] == 'finish_modify') $Output = $this->TeamModifyFinish();
-                        else if($_GET['action'] == 'create') $Output = $this->TeamCreate();
-                        else if($_GET['action'] == 'team') $Output = $this->TeamShow();
-                        else if($_GET['action'] == 'leave') $Output = $this->TeamLeave();
-                        else $Output = $this->ShowTeamList();
-                } else $Output = $this->ShowTeamList();
-                return($Output);
-        }
+    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if (array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+
+    if($this->System->User->Licence(LICENCE_USER))
+      $Output .= '<br /><div style="text-align: center;"><a href="?action=create">'.T('Create translating team').'</a></div><br/>';
+    if($_SESSION['search'] != '')
+    {
+      $SearchQuery = ' AND ((`Name` LIKE "%'.$_SESSION['search'].'%") OR (`Description` LIKE "%'.$_SESSION['search'].'%"))';
+      $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+    } else $SearchQuery = '';
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE 1'.$SearchQuery);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'];
+    $Output .= '<table class="BaseTable">';
+
+    $TableColumns = array(
+        array('Name' => 'Name', 'Title' => T('Name')),
+        array('Name' => 'URL', 'Title' => T('Web pages')),
+        array('Name' => 'LeaderName', 'Title' => T('Leader')),
+        array('Name' => 'NumberUser', 'Title' => T('Member count')),
+        array('Name' => 'TimeCreate', 'Title' => T('Founding date')),
+    );
+    if($this->System->User->Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => T('User actions'));
+
+    $Order = GetOrderTableHeader($TableColumns, 'NumberUser', 1);
+    $Output .= $Order['Output'];
+
+    $DbResult = $this->Database->query('SELECT *, (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) AS `NumberUser`, '.
+      '(SELECT `Name` FROM `User` WHERE `User`.`ID`=`Team`.`Leader`) AS `LeaderName` '.
+      'FROM `Team` WHERE 1'.$SearchQuery.$Order['SQL'].$PageList['SQLLimit']);
+    while($Team = $DbResult->fetch_assoc())
+    {
+      $Output .= '<tr>'.
+          '<td><a href="?action=team&amp;id='.$Team['Id'].'">'.$Team['Name'].'</a></td>'.
+          '<td><a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a></td>'.
+          '<td><a href="'.$this->System->Link('/user.php?user='.$Team['Leader']).'">'.$Team['LeaderName'].'</a></td>'.
+          '<td><a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a></td>'.
+          '<td>'.HumanDate($Team['TimeCreate']).'</td>';
+      if($this->System->User->Licence(LICENCE_USER))
+      {
+        if($Team['Leader'] == $this->System->User->Id) $Action = ' <a href="?action=modify&amp;id='.$Team['Id'].'">Upravit</a>';
+        else $Action = '';
+        if($Team['Id'] == $this->System->User->Team) $Action = ' <a href="?action=leave">Opustit</a>';
+        $Output .= '<td><a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit</a>'.$Action.'</td>';
+      }
+      $Output .= '</tr>';
+    }
+    $Output .= '</table>'.
+        $PageList['Output'];
+
+    return($Output);
+  }
+
+  function TeamJoin()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('id', $_GET))
+      {
+        $this->Database->query('UPDATE `User` SET `Team` = '.$_GET['id'].' WHERE `ID` = '.$this->System->User->Id);
+        $Output = ShowMessage('Vstoupil jsi do týmu.');
+        $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vstoupil do týmu '.$_GET['id'], LOG_TYPE_USER);
+
+        // Delete all teams without users
+        $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+
+        // Set new leader for teams where old leader went to other team
+        $this->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
+
+        $Output .= $this->ShowTeamList();
+      } else $Output = ShowMessage('Nutno zadat id týmu.', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function TeamCreateFinish()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST))
+      {
+        $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');
+        $DbRow = $DbResult->fetch_row();
+        $Count = $DbRow[0];
+        if(($Count == 0) and ($_POST['Name'] != ''))
+        {
+          $this->Database->query('INSERT INTO `Team` (`Name` ,`Description`, `URL`, `TimeCreate`, `Leader`)'.
+              ' VALUES ("'.trim($_POST['Name']).'", "'.trim($_POST['Description']).'", "'.
+              $_POST['URL'].'", NOW(), '.$this->System->User->Id.')');
+          $this->Database->query('UPDATE `User` SET `Team` = '.$this->Database->insert_id.' WHERE `ID` = '.$this->System->User->Id);
+          $Output .= ShowMessage('Překladatelský tým vytvořen.');
+          $this->System->ModuleManager->Modules['Log']->WriteLog('Překladatelský tým vytvořen '.$_POST['Name'], LOG_TYPE_USER);
+
+          // Delete all teams without users
+          $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+        } else $Output .= ShowMessage('Již existuje tým se stejným jménem', MESSAGE_CRITICAL);
+      } else $Output .= ShowMessage('Chybí údaje formuláře', MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    $Output .= $this->ShowTeamList();
+    return($Output);
+  }
+
+  function TeamModify()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('id', $_GET))
+      {
+        $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
+        if($DbResult->num_rows > 0)
+        {
+          $Team = $DbResult->fetch_assoc();
+          $Output = '<form action="?action=finish_modify&amp;id='.$_GET['id'].'" method="post">'.
+              '<fieldset><legend>Nastavení týmu</legend>'.
+              '<table><tr><td>Jméno:</td><td><input type="text" name="Name" value="'.$Team['Name'].'"/></td></tr>'.
+              '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value="'.$Team['URL'].'"/></td></tr>'.
+              '<tr><td>Popis:</td><td><input type="text" name="Description" value="'.$Team['Description'].'"/></td></tr>'.
+              '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
+              '</table></fieldset></form>';
+        } else $Output = ShowMesage('Tým nenalezen.', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage('Nezadáno id týmu', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function TeamModifyFinish()
+  {
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('id', $_GET) and array_key_exists('Name', $_POST) and array_key_exists('Description', $_POST) and array_key_exists('URL', $_POST))
+      {
+        $DbResult = $this->Database->query('SELECT * FROM `Team` WHERE `Id`='.$_GET['id'].' AND `Leader`='.$this->System->User->Id);
+        if($DbResult->num_rows > 0)
+        {
+          $Team = $DbResult->fetch_assoc();
+          $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Team` WHERE `Name` = "'.trim($_POST['Name']).'"');
+          $DbRow = $DbResult->fetch_row();
+          $Count = $DbRow[0];
+          if(($Count == 0) and ($_POST['Name'] != ''))
+          {
+            $this->Database->query('UPDATE `Team` SET `Name`="'.$_POST['Name'].'", `Description`="'.$_POST['Description'].'", `URL`="'.$_POST['URL'].'" WHERE Id='.$Team['Id']);
+            $Output .= ShowMessage('Nastavení týmu uloženo.');
+            $this->System->ModuleManager->Modules['Log']->WriteLog('Překladatelský tým upraven '.$_POST['Name'], LOG_TYPE_USER);
+          } else $Output .= ShowMessage('Již existuje tým se stejným jménem.', MESSAGE_CRITICAL);
+        } else $Output .= ShowMessage('Tým nenalezen nebo nemáte oprávnění.', MESSAGE_CRITICAL);
+      } else $Output .= ShowMessage('Nezadáno id týmu nebo některé položky formuláře.', MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    $Output .= $this->ShowTeamList();
+    return($Output);
+  }
+
+  function TeamCreate()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $Output ='<form action="?action=finish_create" method="post">'.
+          '<fieldset><legend>Vytvoření nového týmu</legend>'.
+          '<table><tr><td>Jméno:</td><td><input type="text" name="Name" /></td></tr>'.
+          '<tr><td>Webové stránky:</td><td>http://<input type="text" name="URL" value=""/></td></tr>'.
+          '<tr><td>Popis:</td><td><input type="text" name="Description" /></td></tr>'.
+          '<tr><td colspan="2"><input type="submit" value="Vytvořit a vstoupit" /></td></tr>'.
+          '</table></fieldset></form>';
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function TeamShow()
+  {
+    $Output = '';
+    if(array_key_exists('id', $_GET) and is_numeric($_GET['id']))
+    {
+      ImgLevelUpdate();
+
+      $DbResult = $this->Database->query('SELECT `Id`, `Name`, `Description`, `URL`, `Leader`, '.
+          '(SELECT COUNT(*) FROM `User` WHERE '.
+          '`Team` = `Team`.`Id`) AS `NumberUser`, (SELECT SUM(`TranslatedCount`) FROM `User` WHERE '.
+          '`Team` = `Team`.`Id`) AS `NumberTranslate` FROM '.
+          '`Team` WHERE `Id`='.($_GET['id'] * 1));
+      if($DbResult->num_rows > 0)
+      {
+        $Team = $DbResult->fetch_assoc();
+        $DbResult2 = $this->Database->query('SELECT `Name`, `Id` FROM `User` WHERE `ID`='.$Team['Leader']);
+        if($DbResult2->num_rows > 0)
+        {
+          $Leader = $DbResult2->fetch_assoc();
+        } else $Leader = array('Name' => '', 'Id' => 0);
+
+        $Output .='<strong>Překladatelský tým '.$Team['Name'].'</strong><br />'.
+            'Webové stránky: <a href="http://'.$Team['URL'].'">'.$Team['URL'].'</a><br/>'.
+            'Vedoucí: <a href="'.$this->System->Link('/user.php?user='.$Leader['Id']).'">'.$Leader['Name'].'</a><br/>'.
+            'Popis: '.$Team['Description'].'<br /><br />';
+        //$Output .= '<a href="export/?team='.$Team['Id'].'">Exportovat překlad týmu</a> ';
+        if($this->System->User->Licence(LICENCE_USER))
+          $Output .='<a href="?action=gointeam&amp;id='.$Team['Id'].'">Vstoupit do týmu</a><br /><br />';
+        $Output .='<fieldset><legend>Statistika</legend>'.
+            'Počet členů týmu: <a href="'.$this->System->Link('/userlist.php?team='.$Team['Id']).'" title="Zobrazit členy týmu">'.$Team['NumberUser'].'</a><br />'.
+            'Počet přeložených textů týmu: <strong>'.$Team['NumberTranslate'].'</strong><br />'.
+            'Průměrná úroveň překladatelů v týmu: <img src="'.$this->System->Link('/tmp/team/'.$Team['Name'].'/level.png').'" /><br /><br />'.
+            '<strong>Stav dokončení týmu pro verzi '.$this->System->Config['Web']['GameVersion'].'</strong><br />';
+
+        $BuildNumber = GetBuildNumber($this->System->Config['Web']['GameVersion']);
+
+        $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
+        $Query = '';
+        $DbResult = $this->Database->query($GroupListQuery);
+        if($DbResult->num_rows > 0)
+        {
+          while($DbRow = $DbResult->fetch_assoc())
+          {
+            $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+                'WHERE (`User` IN (SELECT `ID` FROM `User` WHERE `Team` = '.$Team['Id'].')) '.
+                'AND (`Complete` = 1) AND (`T`.`Language`!='.$this->System->Config['OriginalLanguage'].') '.
+                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+                ') AS `C1`) AS `Translated`, '.
+                '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
+                'SELECT `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T` '.
+                'WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+                'AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+                ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
+          }
+          $Query = substr($Query, 0, - 6);
+
+          $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
+          $DbRow = $DbResult->fetch_row();
+          $PageList = GetPageList($DbRow[0]);
+          $Output .= $PageList['Output'];
+
+          $Output .='<table class="BaseTable">';
+          $TableColumns = array(
+              array('Name' => 'Name', 'Title' => 'Jméno'),
+              array('Name' => 'Translated', 'Title' => 'Přeložených'),
+              array('Name' => 'Total', 'Title' => 'Anglických'),
+              array('Name' => 'Percent', 'Title' => 'Procenta'),
+          );
+
+          $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+          $Output .= $Order['Output'];
+
+          $Translated = 0;
+          $Total = 0;
+          $DbResult = $this->Database->query('SELECT *, ROUND(`Translated` / `Total` * 100, 2) AS `Percent` FROM ('.$Query.') AS `C3` '.$Order['SQL'].$PageList['SQLLimit']);
+          while($Group = $DbResult->fetch_assoc())
+          {
+            $Output .='<tr><td>'.$Group['Name'].'</td><td>'.$Group['Translated'].'</td><td>'.$Group['Total'].'</td><td>'.ProgressBar(150, $Group['Percent']).'</td></tr>';
+            $Translated += $Group['Translated'];
+            $Total += $Group['Total'];
+          }
+          if($Total > 0) $Progress = round($Translated / $Total * 100, 2);
+          else $Progress = 0;
+          $Output .='<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, $Progress).'</strong></td></tr>';
+          $Output .='</table>';
+        }
+        $Output .='</fieldset>';
+      } else $Output .= ShowMessage('Tým nenalezen', MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage('Musíte zadat id týmu', MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function TeamLeave()
+  {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      $this->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$this->System->User->Id);
+      $Output = ShowMessage('Nyní nejste členem žádného týmu.');
+      $this->System->ModuleManager->Modules['Log']->WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);
+
+      // Delete all teams without users
+      $this->Database->query('DELETE FROM `Team` WHERE (SELECT COUNT(*) FROM `User` WHERE `User`.`Team` = `Team`.`Id`) = 0');
+
+      // Set new leader for teams where old leader went to other team
+      $this->Database->query('UPDATE `Team` SET `Leader`=(SELECT `Id` FROM `User` WHERE `User`.`Team`=`Team`.`Id` ORDER BY `User`.`RegistrationTime` LIMIT 1) WHERE `Leader` NOT IN (SELECT `ID` FROM `User` WHERE `User`.`Team`=`Team`.`Id`);');
+
+      $Output .= $this->ShowTeamList();
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function Show()
+  {
+    if(array_key_exists('action', $_GET))
+    {
+      if($_GET['action'] == 'gointeam') $Output = $this->TeamJoin();
+      else if($_GET['action'] == 'finish_create') $Output = $this->TeamCreateFinish();
+      else if($_GET['action'] == 'modify') $Output = $this->TeamModify();
+      else if($_GET['action'] == 'finish_modify') $Output = $this->TeamModifyFinish();
+      else if($_GET['action'] == 'create') $Output = $this->TeamCreate();
+      else if($_GET['action'] == 'team') $Output = $this->TeamShow();
+      else if($_GET['action'] == 'leave') $Output = $this->TeamLeave();
+      else $Output = $this->ShowTeamList();
+    } else $Output = $this->ShowTeamList();
+    return($Output);
+  }
 }

trunk/Modules/Translation/Comparison.php

@@ -3 +3 @@
 class PageTranslationComparison extends Page
 {
-        function CompareString($String1, $String2)
-        {
-                $Result = '';
-                //TODO: Implement colored comparison
-                //strcasecmp($String1, $String2) == 0 je totožné
-                //  echo $String1.'<br /><br />';
-                $ArrStr1 = explode(' ', $String1);
-                $ArrStr2 = explode(' ', $String2);
-        
-                for($i = 0; $i < count($ArrStr1); $i++)
-                {
-                if(isset($ArrStr2[$i]))
-                {
-                    if($ArrStr1[$i] == $ArrStr2[$i])
-                    {
-                      $Result .= $ArrStr1[$i].' ';
-                    } else
-                    {
-                      $find = false;
-                      for($j = 0; $j < count($ArrStr2); $j++)
-                      {
-                        if(($ArrStr1[$i] == $ArrStr2[$j]) and ($find == false))
-                        {
-                          $Result .= $ArrStr1[$i].' ';
-                          $find = true;
-                        }
-                      }
-                      if($find == false)
-                            $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
-                    }
-                  } else $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
-          }
-          return($Result);
-        }
-        
-        function Show()
-        {
-                global $TranslationTree;
-                                            
+  function CompareString($String1, $String2)
+  {
+    $Result = '';
+    //TODO: Implement colored comparison
+    //strcasecmp($String1, $String2) == 0 je totožné
+    //  echo $String1.'<br /><br />';
+    $ArrStr1 = explode(' ', $String1);
+    $ArrStr2 = explode(' ', $String2);
+
+    for($i = 0; $i < count($ArrStr1); $i++)
+    {
+      if(isset($ArrStr2[$i]))
+      {
+        if($ArrStr1[$i] == $ArrStr2[$i])
+        {
+          $Result .= $ArrStr1[$i].' ';
+        } else
+        {
+          $find = false;
+          for($j = 0; $j < count($ArrStr2); $j++)
+          {
+            if(($ArrStr1[$i] == $ArrStr2[$j]) and ($find == false))
+            {
+              $Result .= $ArrStr1[$i].' ';
+              $find = true;
+            }
+          }
+          if($find == false)
+          $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
+        }
+      } else $Result .= '<span class="edit">'.$ArrStr1[$i].' </span>';
+    }
+    return($Result);
+  }
+
+  function Show()
+  {
+    global $TranslationTree;
+
     $Output = '';
 
-                if($this->System->User->Licence(LICENCE_USER))
-                {
+    if($this->System->User->Licence(LICENCE_USER))
+    {
     $Output = 'Text je porovnáván vždy ku předešlému (vlevo). Změny jsou zvýrazněny <span class="edit">barvou.</span><br /><br />';
-    
-                $GroupId = LoadGroupIdParameter();
-                $Table = $TranslationTree[$GroupId]['TablePrefix'];
-        
-                if(array_key_exists('entry', $_GET))
-                {
-                        $Textentry = $_GET['entry'];
-                        if((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1))  //porovnání pouze 2 textů
-                        {
-                                $TextID1 = $_GET['ID1'];   
-                                $TextID2 = $_GET['ID2'];
-                                $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.'))';
-                        } else $WhereID = '';
-        
-                        $DataID = $this->Database->query('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName`, '.
-                                        '`Language`.`Name` AS `LanguageName` '.
-                                        'FROM '.$Table.' LEFT JOIN `User` ON `User`.`Id` = `'.$Table.'`.`User` '.
-                                        ' LEFT JOIN `Language` ON `Language`.`Id` = `'.$Table.'`.`Language` '.
-                                        'WHERE `Entry` = '.$Textentry.' '.$WhereID.' ORDER BY `Language`');
-                        while($Line[] = $DataID->fetch_assoc());
-                        array_pop($Line);
-        
-                        $Output .= 'Počet porovnávaných textů: <strong>'.count($Line).'</strong><br /> ';
-        
-                        $Output .= '<strong>Číslo textu: <a href="http://www.wowhead.com/?quest='.$Textentry.'">'.$Textentry.'</a></strong>'.
-                                        '<table class="BaseTable">'.
-                                        '<tr><th>Přeložil</th>';
-                        foreach($Line as $Index => $LineItem)
-                                $Output .= '<th>'.$LineItem['UserName'].'</th>';
-                        $Output .= '</tr>'.
-                                        '<tr>'.
-                                        '<th>ID textu</th>';
-                        foreach($Line as $Index => $LineItem)
-                                $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['ID'].'">'.$LineItem['ID'].'</a></td>';
-                        $Output .= '</tr>'.
-                                        '<tr><th>Převzato</th>';
-                        foreach($Line as $Index => $LineItem)
-                                $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['Take'].'">'.$LineItem['Take'].'</a></td>';
-                        $Output .= '</tr>'.
-                                        '<tr><th>Jazyk</th>';
-                        foreach($Line as $Index => $LineItem)
-                                $Output .= '<td>'.$LineItem['LanguageName'].'</td>';
-                        $Output .= '</tr>'.
-                                        '<tr><th>Verze</th>';
-                        foreach($Line as $Index => $LineItem)
-                                $Output .= '<td>'.GetVersionWOW($LineItem['VersionStart']).' - '.GetVersionWOW($LineItem['VersionEnd']).'</td>';
-                        $Output .= '</tr>';
-                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                        {
-                          $writethis = false;
-                                for($i = 0; $i < count($Line); $i++)
-                                {
-                                  if($Line[$i][$TextItem['Column']] <> '') $writethis = true;
-                                }
-                                if($writethis)
-                                {
-                                        $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
-                                        for($i = 0; $i < count($Line); $i++)
-                                        {
-                                                if($i > 0)
-                                                {
-                                                  $Output .= '<td>';
-                                                  $Output .= str_replace("\n", '<br/>', $this->CompareString(htmlspecialchars($Line[$i][$TextItem['Column']]),htmlspecialchars($Line[$i - 1][$TextItem['Column']])));
-                                                  $Output .= '</td>';
-                                          } else $Output .= '<td>'.htmlspecialchars($Line[$i][$TextItem['Column']]).'</td>';
-                                  }
-                                  $Output .= '</tr>';
-                    }
-                  }
-                  $Output .= '</table>';
-          } else $Output .= ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL); 
-  } else $Output .= ShowMessage('Porovnávat můžou pouze překladatelé!', MESSAGE_CRITICAL);     
 
-                return($Output);
-        }     
+    $GroupId = LoadGroupIdParameter();
+    $Table = $TranslationTree[$GroupId]['TablePrefix'];
+
+    if(array_key_exists('entry', $_GET))
+    {
+      $Textentry = $_GET['entry'];
+      if((array_key_exists('ID1', $_GET)) and ($_GET['ID1'] <> -1))  //porovnání pouze 2 textů
+      {
+        $TextID1 = $_GET['ID1'];
+        $TextID2 = $_GET['ID2'];
+        $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.'))';
+      } else $WhereID = '';
+
+      $DataID = $this->Database->query('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName`, '.
+          '`Language`.`Name` AS `LanguageName` '.
+          'FROM '.$Table.' LEFT JOIN `User` ON `User`.`Id` = `'.$Table.'`.`User` '.
+          ' LEFT JOIN `Language` ON `Language`.`Id` = `'.$Table.'`.`Language` '.
+          'WHERE `Entry` = '.$Textentry.' '.$WhereID.' ORDER BY `Language`');
+      while($Line[] = $DataID->fetch_assoc());
+      array_pop($Line);
+
+      $Output .= 'Počet porovnávaných textů: <strong>'.count($Line).'</strong><br /> ';
+
+      $Output .= '<strong>Číslo textu: <a href="http://www.wowhead.com/?quest='.$Textentry.'">'.$Textentry.'</a></strong>'.
+          '<table class="BaseTable">'.
+          '<tr><th>Přeložil</th>';
+      foreach($Line as $Index => $LineItem)
+        $Output .= '<th>'.$LineItem['UserName'].'</th>';
+      $Output .= '</tr>'.
+          '<tr>'.
+          '<th>ID textu</th>';
+      foreach($Line as $Index => $LineItem)
+        $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['ID'].'">'.$LineItem['ID'].'</a></td>';
+      $Output .= '</tr>'.
+          '<tr><th>Převzato</th>';
+      foreach($Line as $Index => $LineItem)
+        $Output .= '<td><a href="form.php?group='.$GroupId.'&amp;ID='.$LineItem['Take'].'">'.$LineItem['Take'].'</a></td>';
+      $Output .= '</tr>'.
+          '<tr><th>Jazyk</th>';
+      foreach($Line as $Index => $LineItem)
+        $Output .= '<td>'.$LineItem['LanguageName'].'</td>';
+      $Output .= '</tr>'.
+          '<tr><th>Verze</th>';
+      foreach($Line as $Index => $LineItem)
+        $Output .= '<td>'.GetVersionWOW($LineItem['VersionStart']).' - '.GetVersionWOW($LineItem['VersionEnd']).'</td>';
+      $Output .= '</tr>';
+      foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+      {
+        $writethis = false;
+        for($i = 0; $i < count($Line); $i++)
+        {
+          if($Line[$i][$TextItem['Column']] <> '') $writethis = true;
+        }
+        if($writethis)
+        {
+          $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
+          for($i = 0; $i < count($Line); $i++)
+          {
+            if($i > 0)
+            {
+              $Output .= '<td>';
+              $Output .= str_replace("\n", '<br/>', $this->CompareString(htmlspecialchars($Line[$i][$TextItem['Column']]),htmlspecialchars($Line[$i - 1][$TextItem['Column']])));
+              $Output .= '</td>';
+            } else $Output .= '<td>'.htmlspecialchars($Line[$i][$TextItem['Column']]).'</td>';
+          }
+          $Output .= '</tr>';
+        }
+      }
+      $Output .= '</table>';
+    } else $Output .= ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
+  } else $Output .= ShowMessage('Porovnávat můžou pouze překladatelé!', MESSAGE_CRITICAL);
+
+    return($Output);
+  }
 }

trunk/Modules/Translation/Form.php

@@ -6 +6 @@
   var $ID;
 
-        function Show()
-        {
-                $this->Title = T('Translation');
-                $Action = '';
+  function Show()
+  {
+    $this->Title = T('Translation');
+    $Action = '';
     if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
 
     if($Action == 'delete') $Output = $this->Delete();
-                  else $Output = $this->ShowForm();
-                return($Output);
-        }
-
-        function ShowForm()
-        {
-                global $TranslationTree;
-
-                $Output = '';
-
-                $GroupId = LoadGroupIdParameter();
-                $this->GroupId = $GroupId;
-                $Table = $TranslationTree[$GroupId]['TablePrefix'];
-                if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
-                else $Action = '';
-
-                if(array_key_exists('ID', $_GET))
-                {
-                        $TextID = $_GET['ID'] * 1;
-                  $this->ID = $TextID;
-
-                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
-                        $Line = $DbResult->fetch_assoc();
-                        if(!$Line)
-                        {
-                                $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
-                        } else
-                        {
-                          if ($this->System->Config['OriginalLanguage'] == $Line['Language']){
+      else $Output = $this->ShowForm();
+    return($Output);
+  }
+
+  function ShowForm()
+  {
+    global $TranslationTree;
+
+    $Output = '';
+
+    $GroupId = LoadGroupIdParameter();
+    $this->GroupId = $GroupId;
+    $Table = $TranslationTree[$GroupId]['TablePrefix'];
+    if(array_key_exists('action', $_GET)) $Action = $_GET['action'];
+    else $Action = '';
+
+    if(array_key_exists('ID', $_GET))
+    {
+      $TextID = $_GET['ID'] * 1;
+      $this->ID = $TextID;
+
+      $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
+      $Line = $DbResult->fetch_assoc();
+      if(!$Line)
+      {
+        $Output .= ShowMessage('Překlad nenalezen.', MESSAGE_CRITICAL);
+      } else
+      {
+        if ($this->System->Config['OriginalLanguage'] == $Line['Language']){
           $LineAJ = $Line;
 
@@ -51 +51 @@
 
 
-                                $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
+          $sql = 'SELECT '.$Columns.' Tran.`Entry` FROM `'.$Table.'` as Tran';
           $join = ' JOIN `'.$Table.'` as `Orig` ON `Orig`.`Language` = 0 AND `Tran`.`Entry` = `Orig`.`Entry` AND `Tran`.`VersionEnd` = `Orig`.`VersionEnd` ';
           $where = ' WHERE '.'( `Tran`.'.$Language.' ) AND '.'(`Tran`.`Entry` = '.$Line['Entry'].') ORDER BY `Tran`.`ModifyTime` DESC';
-                                $DbResult = $this->Database->query($sql.$join.$where);
+          $DbResult = $this->Database->query($sql.$join.$where);
           while ($LineSearch = $DbResult->fetch_assoc()) {
-                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                  if($TextItem['Visible'] == 1)
-                                                  if (($LineAJ[$TextItem['Column']] <> '') and
+            foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+              if($TextItem['Visible'] == 1)
+                if (($LineAJ[$TextItem['Column']] <> '') and
                     ($LineSearch[$TextItem['Column']] <> '') and
                     ($LineSearch['Orig_'.$TextItem['Column']] <> $LineSearch[$TextItem['Column']]) and
@@ -65 +65 @@
                  {
                    $Line[$TextItem['Column']] = $LineSearch[$TextItem['Column']];
-                                                  //   echo $Line[$TextItem['Column']].'<br />';
+                //   echo $Line[$TextItem['Column']].'<br />';
                  }
           }
 
         } else {
-                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
-                                        '(`Language` = '.$this->System->Config['OriginalLanguage'].') AND '.
-                                        '(`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
-                                $LineAJ = $DbResult->fetch_assoc();
+          $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE '.
+          '(`Language` = '.$this->System->Config['OriginalLanguage'].') AND '.
+          '(`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
+          $LineAJ = $DbResult->fetch_assoc();
         }
-                                if(!$LineAJ)
-                                {
-                                        $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
-                                } else
-                                {
-
-                                        if($Line['User'] != '')
-                                        {
-                                                $IDUser = $this->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
-                                                $LineUser = $IDUser->fetch_array();
-                                        } else
-                                                $LineUser = array('Name' => '');
-
-                                        $Output .= 'Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
-
-                                        if(($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
-                                                $Output .= 'Přeložil: <strong>'.$LineUser['Name'].'</strong> dne '.HumanDate($Line['ModifyTime']).'<br />';
-                                        if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
-                                        {
-                                                $DbResult = $this->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
-                                                $Language = $DbResult->fetch_assoc();
-                                                // echo $Language['Language'].'  '.$Line['Take'];
-
-                                                $DbResult = $this->Database->query('SELECT `Name` FROM `Language` WHERE `Id` ='.$Language['Language']);
-                                                $Lang = $DbResult->fetch_assoc();
-
-                                                $Output .= 'Původní text: <strong>'.
-                                                        ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
-                                                        ' ('.$Lang['Name'].')'.
-                                                        ' <br />';
-                                        }
-                                        $Output .= 'Text: ';
-                                        if($Line['Language'] <> 0)
-                                        {
-                                                if($Line['Complete'] == 1) $Output .= ' <b>Hotov</b>';
-                                                else $Output .= ' <b> Uložen v rozepsaných</b> ';
-                                        } else $Output .= ' <b>Anglická, původní verze</b> ';
-
-                                        $Output .= '<br />'.
-                                                'Verze: <b><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.GetVersionWOWId($Line['VersionStart'])).'">'.GetVersionWOW($Line['VersionStart']).
+        if(!$LineAJ)
+        {
+          $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
+        } else
+        {
+
+          if($Line['User'] != '')
+          {
+            $IDUser = $this->Database->query('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
+            $LineUser = $IDUser->fetch_array();
+          } else
+            $LineUser = array('Name' => '');
+
+          $Output .= 'Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />';
+
+          if(($Line['Language'] <> 0) and ($LineUser['Name'] <> ''))
+            $Output .= 'Přeložil: <strong>'.$LineUser['Name'].'</strong> dne '.HumanDate($Line['ModifyTime']).'<br />';
+          if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID']))
+          {
+            $DbResult = $this->Database->query('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']);
+            $Language = $DbResult->fetch_assoc();
+            // echo $Language['Language'].'  '.$Line['Take'];
+
+            $DbResult = $this->Database->query('SELECT `Name` FROM `Language` WHERE `Id` ='.$Language['Language']);
+            $Lang = $DbResult->fetch_assoc();
+
+            $Output .= 'Původní text: <strong>'.
+              ' ID <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a></strong>'.
+              ' ('.$Lang['Name'].')'.
+              ' <br />';
+          }
+          $Output .= 'Text: ';
+          if($Line['Language'] <> 0)
+          {
+            if($Line['Complete'] == 1) $Output .= ' <b>Hotov</b>';
+            else $Output .= ' <b> Uložen v rozepsaných</b> ';
+          } else $Output .= ' <b>Anglická, původní verze</b> ';
+
+          $Output .= '<br />'.
+            'Verze: <b><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.GetVersionWOWId($Line['VersionStart'])).'">'.GetVersionWOW($Line['VersionStart']).
             '</a> - <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.GetVersionWOWId($Line['VersionEnd'])).'">'.GetVersionWOW($Line['VersionEnd']).'</a></b>'.
-                                                '<br />';
-
-                                        $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.
-                                                '(`Entry` = '.$Line['Entry'].')');
-                                        $Version = $DbResult->fetch_row();
-                                        $Version = $Version[0];
-                                        if($Version > 0)
-                                        {
-                                                $Output .= '<form action="comparison.php" method="get"><a href="TranslationList.php?group='.
-                                                $GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>
-                                                <input type="hidden" name="group" value="'.$GroupId.'" />
-                                                <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
-                                                <input type="hidden" name="ID2" value="'.$TextID.'" />';
+            '<br />';
+
+          $DbResult = $this->Database->query('SELECT COUNT(*) FROM `'.$Table.'` WHERE '.
+            '(`Entry` = '.$Line['Entry'].')');
+          $Version = $DbResult->fetch_row();
+          $Version = $Version[0];
+          if($Version > 0)
+          {
+            $Output .= '<form action="comparison.php" method="get"><a href="TranslationList.php?group='.
+              $GroupId.'&amp;user=0&amp;state=2&amp;entry='.$Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>
+            <input type="hidden" name="group" value="'.$GroupId.'" />
+            <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
+            <input type="hidden" name="ID2" value="'.$TextID.'" />';
 
             if($this->System->User->Licence(LICENCE_USER)) { //allow to compare only to user
               $Output .= '<select onchange="this.form.submit();" name="ID1">
-                                                <option value="-1">Vyberte text k porovnání</option>
-                                                <option value="-1">Zobrazit/porovnat všechny</option>';
-                                                $DataID = $this->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].')');
-                                                while($Version = $DataID->fetch_array())
-                                                {
-                                                        if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.
-                                                           $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>';
-                                                        else
-                                                        {
-                                                                if($Version['Language'] == 0) $Version['UserName'] = 'Předloha';
-                                                                $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.
-                                                                                $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '.
-                                                                                GetVersionWOW($Version['VersionEnd']).')</option>';
-                                                        }
-                                                  }
-                                                  $Output .= '</select>';
+              <option value="-1">Vyberte text k porovnání</option>
+              <option value="-1">Zobrazit/porovnat všechny</option>';
+              $DataID = $this->Database->query('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].')');
+              while($Version = $DataID->fetch_array())
+              {
+                if($Version['ID'] == $Line['Take']) $Output .= '<option value="'.
+                 $Version['ID'].'">'.$Version['ID'].' - '.$Version['User'].' (převzato)</option>';
+                else
+                {
+                  if($Version['Language'] == 0) $Version['UserName'] = 'Předloha';
+                  $Output .= '<option value="'.$Version['ID'].'">'.$Version['ID'].' - '.
+                      $Version['UserName'].' ('.GetVersionWOW($Version['VersionStart']).' - '.
+                      GetVersionWOW($Version['VersionEnd']).')</option>';
+                }
+              }
+              $Output .= '</select>';
             }
             $Output .= '</form>';
-                                        } else
-                                        {
-                                                $Output .= '<a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.
-                                                  $Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>';
-                                        }
-
-                                        // Special characters: $B - New line, $N - Name, $C - profession
-                                        if($this->System->User->Licence(LICENCE_USER))
-                                        {
-                                                $Output .= '<form action="save.php?group='.$GroupId.'" method="post"><div>';
-                                                // TODO: Remove fixed group id condition
-                                        //      if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
-                                                        $Output .= '<a href="'.$this->System->Link('/dictionary/?action=group&amp;group='.$GroupId.'&amp;ID='.$LineAJ['ID']).'" target="_blank"  title="Zobrazit přeložené názvy věci, postav, a herních objektů k tomuto překladu">Vyhledat v názvech</a>';
-                                                $Output .= ' <input type="submit" value="Uložit do rozepsaných" name="save" title="Klikněte na uložit pro pozdější dokončení překladu" />'.
-                                                                '<input type="submit" value="Dokončeno" name="End" title="Klikněte na Dokončeno jesli jsou všechny texty hotové a chcete již publikovat" /> ';
-                                                FollowingTran($TextID, $Table, $GroupId, true);
-                                                FollowingTran($TextID, $Table, $GroupId);
-                                        }
-
-                                        if($TranslationTree[$GroupId]['WowheadName'] != '')
-                                                $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
-                                        else $WowheadLink = $LineAJ['Entry'];
-
-                                        $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
-                                        <input type="hidden" name="user" value="'.$this->System->User->Id.'" />
-                                        <input type="hidden" name="ID" value="'.$TextID.'" />
-                                        <table class="BaseTable">
-                                        <tr>
-                                        <th>Číslo textu: '.$WowheadLink.'</th>
-                                        <th>Nepřeložené</th>
-                                        <th>Přeložené</th>
-                                        </tr>
-                                        <tr>
-                                        <th>Jazyk</th>
-                                        <td>Anglický</td>
-                                        <td>';
-                                        if($Line['Language'] <> 0) $Language = $Line['Language'];
-                                        else if($this->System->User->Id != 0)
-                                        {
-                                                $Language = $this->System->User->Language;
-                                        } else $Language = 0;
-                                        if($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
-                                          else {
-                  $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '(`Enabled` = 1) AND (`Id`='.$Language.')');
-                  if($DbResult3->num_rows > 0)
-                  {
-                        $Language = $DbResult3->fetch_assoc();
-                        $Output .= $Language['Name'];
-                  }
-                                          }
-
-                                        $Output .= '</td></tr>';
+          } else
+          {
+            $Output .= '<a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;state=2&amp;entry='.
+              $Line['Entry'].'&amp;text=">Počet verzí: <strong>'.$Version.'</strong></a>';
+          }
+
+          // Special characters: $B - New line, $N - Name, $C - profession
+          if($this->System->User->Licence(LICENCE_USER))
+          {
+            $Output .= '<form action="save.php?group='.$GroupId.'" method="post"><div>';
+            // TODO: Remove fixed group id condition
+          //  if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
+              $Output .= '<a href="'.$this->System->Link('/dictionary/?action=group&amp;group='.$GroupId.'&amp;ID='.$LineAJ['ID']).'" target="_blank"  title="Zobrazit přeložené názvy věci, postav, a herních objektů k tomuto překladu">Vyhledat v názvech</a>';
+            $Output .= ' <input type="submit" value="Uložit do rozepsaných" name="save" title="Klikněte na uložit pro pozdější dokončení překladu" />'.
+                '<input type="submit" value="Dokončeno" name="End" title="Klikněte na Dokončeno jesli jsou všechny texty hotové a chcete již publikovat" /> ';
+            FollowingTran($TextID, $Table, $GroupId, true);
+            FollowingTran($TextID, $Table, $GroupId);
+          }
+
+          if($TranslationTree[$GroupId]['WowheadName'] != '')
+            $WowheadLink = '<a href="http://www.wowhead.com/?'.$TranslationTree[$GroupId]['WowheadName'].'='.$LineAJ['Entry'].'">'.$LineAJ['Entry'].'</a>';
+          else $WowheadLink = $LineAJ['Entry'];
+
+          $Output .= '<input type="hidden" name="entry" value="'.$LineAJ['Entry'].'" />
+          <input type="hidden" name="user" value="'.$this->System->User->Id.'" />
+          <input type="hidden" name="ID" value="'.$TextID.'" />
+          <table class="BaseTable">
+          <tr>
+          <th>Číslo textu: '.$WowheadLink.'</th>
+          <th>Nepřeložené</th>
+          <th>Přeložené</th>
+          </tr>
+          <tr>
+          <th>Jazyk</th>
+          <td>Anglický</td>
+          <td>';
+          if($Line['Language'] <> 0) $Language = $Line['Language'];
+          else if($this->System->User->Id != 0)
+          {
+            $Language = $this->System->User->Language;
+          } else $Language = 0;
+          if($this->System->User->Licence(LICENCE_USER)) $Output .= WriteLanguages($Language);
+            else {
+            $DbResult3 = $this->Database->select('Language', '`Id`, `Name`', '(`Enabled` = 1) AND (`Id`='.$Language.')');
+            if($DbResult3->num_rows > 0)
+            {
+              $Language = $DbResult3->fetch_assoc();
+              $Output .= $Language['Name'];
+            }
+            }
+
+          $Output .= '</td></tr>';
 
           //todo javascript
 
-            $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
+          $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
                '<script>';
           $Output .=    '$(document).ready(function() {';
-                                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
             $Output .=   '$("#'.$TextItem['Column'].'").load("'.$this->System->Link('/LoadNames.php?ID='.$LineAJ['ID'].'&Column='.$TextItem['Column'].'&GroupId='.$GroupId).'");';
 
@@ -214 +214 @@
                '</script>';
 
-                                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                if($TextItem['Visible'] == 1)
-                                                {
-                                                        if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
-                                                        {
-                                                                if(($TextItem['Name'] == 'Text') and (($Table == 'global_strings') or ($Table == 'glue_strings')))
-                                                                        $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
-                                                                else $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
-                                                                $Output .= '<td id="'.$TextItem['Column'].'">'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
-                                                                <td>';
-                                                                if($this->System->User->Licence(LICENCE_USER))
-                                                                        $Output .= '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">';
-                                                                $Output .=  htmlspecialchars($Line[$TextItem['Column']]);
-                                                                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
-                                                        }
-                                                } else
-                                                {
-                                                        $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Line[$TextItem['Column']]).'" />';
-                                                }
-                                                $Output .= '</table></div>';
-                                                if($this->System->User->Licence(LICENCE_USER)) {
+          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+            if($TextItem['Visible'] == 1)
+            {
+              if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))
+              {
+                if(($TextItem['Name'] == 'Text') and (($Table == 'global_strings') or ($Table == 'glue_strings')))
+                  $Output .= '<tr><th>'.$LineAJ['ShortCut'].'</th>';
+                else $Output .= '<tr><th>'.$TextItem['Name'].'</th>';
+                $Output .= '<td id="'.$TextItem['Column'].'">'.str_replace("\n", '<br/>', htmlspecialchars($LineAJ[$TextItem['Column']])).'</td>
+                <td>';
+                if($this->System->User->Licence(LICENCE_USER))
+                  $Output .= '<textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">';
+                $Output .=  htmlspecialchars($Line[$TextItem['Column']]);
+                if($this->System->User->Licence(LICENCE_USER)) $Output .= '</textarea></td></tr>';
+              }
+            } else
+            {
+              $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Line[$TextItem['Column']]).'" />';
+            }
+            $Output .= '</table></div>';
+            if($this->System->User->Licence(LICENCE_USER)) {
               $Output .= '</form>';
 
               $Output .= '<table class="BaseTable">'.
-                                            '<tr><th>Překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
-                                          foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                                                  if($TextItem['Visible'] == 1)
-                                                  if ($LineAJ[$TextItem['Column']] <> '')
+              '<tr><th>Překladač:</th><th>Nepřeložené</th><th>Přeložené</th>';
+              foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+                if($TextItem['Visible'] == 1)
+                  if ($LineAJ[$TextItem['Column']] <> '')
                     $Output .= '<tr><td>'.$TextItem['Column'].'</td><td>'.$LineAJ[$TextItem['Column']].'</td><td>'.GetTranslateGoogle($LineAJ[$TextItem['Column']]).'</td></tr>';
 
@@ -247 +247 @@
               $Output .= '</table>';
             }
-                                }
-                        }
-                } else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
-                return($Output);
-        }
-
-        function Delete()
-        {
-                global $TranslationTree;
-
-                if($this->System->User->Licence(LICENCE_MODERATOR))
-                {
-                        $GroupId = LoadGroupIdParameter();
-                  $this->GroupId = $GroupId;
-                  $Table = $TranslationTree[$GroupId]['TablePrefix'];
-                        $TextID = $_GET['ID'];
-                        $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="'.$this->System->Link('/form.php?group='.$this->GroupId.'&amp;ID='.$TextID).'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
+        }
+      }
+    } else $Output = ShowMessage('Nebylo zadáno ID.', MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function Delete()
+  {
+    global $TranslationTree;
+
+    if($this->System->User->Licence(LICENCE_MODERATOR))
+    {
+      $GroupId = LoadGroupIdParameter();
+      $this->GroupId = $GroupId;
+      $Table = $TranslationTree[$GroupId]['TablePrefix'];
+      $TextID = $_GET['ID'];
+      $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="'.$this->System->Link('/form.php?group='.$this->GroupId.'&amp;ID='.$TextID).'">'.$TextID.'</a>', LOG_TYPE_MODERATOR);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
 }

trunk/Modules/Translation/LoadNames.php

@@ -3 +3 @@
 class PageLoadNames extends Page
 {
-  function ReplaceTranslated($orig,$tran,$Text,$ID,$Group) 
+  function ReplaceTranslated($orig,$tran,$Text,$ID,$Group)
   {
     $tran_replace = str_replace(' ',' ',htmlspecialchars($tran));
@@ -9 +9 @@
 
     //  if (strlen($orig) < strlen($Text)-1) {
-    if ($Group <> '') 
+    if ($Group <> '')
     {
       $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$tran_replace.
         '" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
-    } else {  
+    } else {
       $Text = str_replace(' '.$orig,' <span Title="Přelož jako:&nbsp;'.$tran_replace.
         '" class="edit"><a class="edit" target="_NEW2" href="'.$this->System->Link('/dictionary/?search='.$tran).'">'.$orig_replace.'</a></span>',$Text);
     }
-        //       }
+  //   }
     return ($Text);
   }
-  function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group) 
+  function ReplaceNotTranslated($orig,$tran,$Text,$ID,$Group)
   {
     $orig_replace = str_replace(' ','&nbsp;',htmlspecialchars($orig));
-        
+
     $Text = str_replace(' '.$orig,' <span title="Kliknutím přeložíš" class="needtran"><a class="needtran" target="_NEW2" href="'.
       $this->System->Link('/form.php?group='.$Group.'&amp;ID='.$ID).'">'.$orig_replace.'</a></span>',$Text);
     return ($Text);
   }
-  
-        function ColorNames($Text, $names)
-        {
+
+  function ColorNames($Text, $names)
+  {
     $Text = ' '.$Text;
     $Text = str_replace('$B$B','$B$B ',$Text);
-    
-          $Text = str_replace('$B','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
-          $Text = str_replace('$N','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
-          $Text = str_replace('$R','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
-          $Text = str_replace('$C','<span Title="Znamená povolání hráče, překladu zachovej na stejné pozici." class="edit">$C</span>',$Text);
-          $Text = str_replace('$G','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
-          $Text = str_replace('$b','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
-          $Text = str_replace('$n','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
-          $Text = str_replace('$c','<span Title="Znamená povolání hráče, překladu zachovej na stejné pozici." class="edit">$c</span>',$Text);
-          $Text = str_replace('$r','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
-          $Text = str_replace('$g','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
-                foreach($names as $Line) {
-                 if (($_GET['ID'] <> $Line[0]) or ($Line[1] <> $_GET['GroupId']))       
+
+    $Text = str_replace('$B','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
+    $Text = str_replace('$N','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
+    $Text = str_replace('$R','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
+    $Text = str_replace('$C','<span Title="Znamená povolání hráče, překladu zachovej na stejné pozici." class="edit">$C</span>',$Text);
+    $Text = str_replace('$G','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
+    $Text = str_replace('$b','<span Title="Znamená odřádkování, překladu zachovej na stejné pozici." class="edit">$B</span>',$Text);
+    $Text = str_replace('$n','<span Title="Znamená jméno hráče, překladu zachovej na stejné pozici." class="edit">$N</span>',$Text);
+    $Text = str_replace('$c','<span Title="Znamená povolání hráče, překladu zachovej na stejné pozici." class="edit">$c</span>',$Text);
+    $Text = str_replace('$r','<span Title="Znamená rasu hráče, překladu zachovej na stejné pozici." class="edit">$R</span>',$Text);
+    $Text = str_replace('$g','<span Title="Vybere oslovení podle pohlaví hráče, překladu zachovej na stejné pozici." class="edit">$G</span>',$Text);
+    foreach($names as $Line) {
+     if (($_GET['ID'] <> $Line[0]) or ($Line[1] <> $_GET['GroupId']))
       if ($Line[3] <> '')  {
         $Text = $this->ReplaceTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
-        
-                        } else {
+
+      } else {
         $Text = $this->ReplaceNotTranslated($Line[2],$Line[3],$Text,$Line[0],$Line[1]);
-                        }
-                }
-                return $Text;
-        }               
+      }
+    }
+    return $Text;
+  }
 
-  function LoadNames() 
+  function LoadNames()
   {
     global $TranslationTree;
-                
+
     $Output = '';
     if(array_key_exists('GroupId', $_GET)) $GroupId = $_GET['GroupId'];
@@ -71 +71 @@
     //$Text = $LineAJ[$TranslationTree[$GroupId]['Items'][$_GET['Item']]];
           $Text = $LineAJ[$Column];
-                $names = array();
-                if ($this->System->User->Licence(LICENCE_USER))
-                                        if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) 
+          $names = array();
+          if ($this->System->User->Licence(LICENCE_USER))
+          if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11))
           {
-                                                //<span class="edit">barvou.</span>
-                                                $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
-                                        } else {
-                                        if(($GroupId == 13)) {
-                                                $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextItemSubClass' => 'Name', 'TextCharacterRace' => 'Name1',),false);
+            //<span class="edit">barvou.</span>
+            $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
+          } else {
+            if(($GroupId == 13)) {
+              $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextGlobalString' => 'Text', 'TextArea' => 'Name', 'TextItemSubClass' => 'Name', 'TextCharacterRace' => 'Name1',),false);
             } else {
-                                                $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
-                                        }
-                                        }
-                                         //$LineAJ[$Column]
-                                        return ($this->ColorNames(htmlspecialchars($Text),$names));
+              $names = GetTranslatNames($Text, 0, GetTranslatNamesArray());
+            }
+          }
+                                   //$LineAJ[$Column]
+          return ($this->ColorNames(htmlspecialchars($Text),$names));
     }
 
   function Show()
   {
-        $this->RawPage = true;
+    $this->RawPage = true;
     return(str_replace("\n", '<br/>', $this->LoadNames()));
   }

trunk/Modules/Translation/Progress.php

@@ -6 +6 @@
   {
     $Output = '';
-    
+
     $BuildNumber = GetBuildNumber($_SESSION['StatVersion']);
     if(is_numeric($_SESSION['language'])) $LanguageFilter = 'AND (`Language`='.$_SESSION['language'].')';
     else $LanguageFilter = ' AND (`Language`!='.$this->System->Config['OriginalLanguage'].')';
-    
+
     $GroupListQuery = 'SELECT `Id`, `TablePrefix`, `Name` FROM `Group`';
     $Query = '';
@@ -30 +30 @@
       }
       $Query = substr($Query, 0, - 6);
-    
+
       $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$GroupListQuery.') AS `T`');
       $DbRow = $DbResult->fetch_row();
       $PageList = GetPageList($DbRow[0]);
       $Output .= $PageList['Output'];
-    
+
       $Output .= '<table class="BaseTable">';
       $TableColumns = array(
@@ -43 +43 @@
           array('Name' => 'Percent', 'Title' => 'Procenta'),
       );
-    
+
       $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
       $Output .= $Order['Output'];
-    
+
       $Translated = 0;
       $Total = 0;
@@ -62 +62 @@
     }
     return($Output);
-  } 
+  }
 
   function Show()
   {
-        $this->Title = T('Progress');
+    $this->Title = T('Progress');
 $LanguageList = GetLanguageList();
 
 if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-if(!array_key_exists('StatVersion', $_SESSION)) 
-{   
+if(!array_key_exists('StatVersion', $_SESSION))
+{
   if($this->System->User->Licence(LICENCE_USER) and ($this->System->User->PreferredVersionGame != ''))
-        {
+  {
     $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
   } else
     $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
-} 
+}
 
 if(!isset($_SESSION['language']))
 {
-        if($this->System->User->Licence(LICENCE_USER))
-        {
-                $_SESSION['language'] = $this->System->User->Language;
+  if($this->System->User->Licence(LICENCE_USER))
+  {
+    $_SESSION['language'] = $this->System->User->Language;
   } else $_SESSION['language'] = '';
 }
 if(array_key_exists('language', $_GET)) {
   if($_GET['language'] == '') $_SESSION['language'] = '';
-          else {
-            $_SESSION['language'] = $_GET['language'] * 1;
-          }
+    else {
+      $_SESSION['language'] = $_GET['language'] * 1;
+    }
 }
 if(!array_key_exists($_SESSION['language'], $LanguageList)) $_SESSION['language'] = '';
@@ -109 +109 @@
 if($Language['Enabled'] == 1)
 {
-        $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+  $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
   if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
     else $Output .= $Lang;

trunk/Modules/Translation/Save.php

@@ -5 +5 @@
   function Show()
   {
-        global $TranslationTree, $Message, $MessageType;
-        
-        $Output = '';
-        $CompleteText = array('nedokončený', 'dokončený');
-        
-        unset($Message);
-        $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
-        if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
-        
-        $GroupId = LoadGroupIdParameter();
-        $Group = $TranslationTree[$GroupId];
-        $Table = $Group['TablePrefix'];
-        if($this->System->User->Licence(LICENCE_USER))
-        {
-                if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
-                {
-                        $Entry = $_POST['entry'] * 1;
-                        $TextID = $_POST['ID'] * 1;
-                        $Language = $_POST['Language'] * 1;
-                        if(array_key_exists('End', $_POST)) $Complete = 1;
-                          else $Complete = 0;
-        
-                        // Get source text record from database by ID
-                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
-                        if($DbResult->num_rows > 0)
-                        {
-                                $SourceText = $DbResult->fetch_assoc();
-        
-                                // Get data for english original
-                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') '.
-                                        'AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
-                                        'AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
-                                if($DbResult->num_rows > 0)
-                                {
-                                        $EnglishText = $DbResult->fetch_assoc();
-        
-                                        // Get all similar english texts
-                                        $Filter = '';
-                                        foreach($Group['Items'] as $GroupItem)
-                                                if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
-                                                $Filter .= ' OR (`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
-                                        if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
-        
-                                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter);
-                                        while($EnglishFound = $DbResult->fetch_assoc())
-                                        {
-                                                // Get user translation paired to found english item entry
-                                                //TODO: and need update sql
-                                                //SELECT T.ID,T.Take,sub1.ID,T.`VersionStart`,T.`VersionEnd`,sub1.`VersionStart` as OrigStart,sub1.`VersionEnd` as OrigEnd FROM `TextSpell` as T
-//JOIN `TextSpell` as sub1 ON sub1.Language = 0 AND T.`Entry` = sub1.`Entry` AND T.`VersionStart` = sub1.`VersionStart` 
+    global $TranslationTree, $Message, $MessageType;
+
+    $Output = '';
+    $CompleteText = array('nedokončený', 'dokončený');
+
+    unset($Message);
+    $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
+    if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
+
+    $GroupId = LoadGroupIdParameter();
+    $Group = $TranslationTree[$GroupId];
+    $Table = $Group['TablePrefix'];
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
+      {
+        $Entry = $_POST['entry'] * 1;
+        $TextID = $_POST['ID'] * 1;
+        $Language = $_POST['Language'] * 1;
+        if(array_key_exists('End', $_POST)) $Complete = 1;
+          else $Complete = 0;
+
+        // Get source text record from database by ID
+        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
+        if($DbResult->num_rows > 0)
+        {
+          $SourceText = $DbResult->fetch_assoc();
+
+          // Get data for english original
+          $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') '.
+            'AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') '.
+            'AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
+          if($DbResult->num_rows > 0)
+          {
+            $EnglishText = $DbResult->fetch_assoc();
+
+            // Get all similar english texts
+            $Filter = '';
+            foreach($Group['Items'] as $GroupItem)
+              if(($GroupItem['Visible'] == 1) and ($EnglishText[$GroupItem['Column']] != ''))
+              $Filter .= ' OR (`'.$GroupItem['Column'].'` = "'.addslashes($EnglishText[$GroupItem['Column']]).'")';
+            if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
+
+            $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter);
+            while($EnglishFound = $DbResult->fetch_assoc())
+            {
+              // Get user translation paired to found english item entry
+              //TODO: and need update sql
+              //SELECT T.ID,T.Take,sub1.ID,T.`VersionStart`,T.`VersionEnd`,sub1.`VersionStart` as OrigStart,sub1.`VersionEnd` as OrigEnd FROM `TextSpell` as T
+//JOIN `TextSpell` as sub1 ON sub1.Language = 0 AND T.`Entry` = sub1.`Entry` AND T.`VersionStart` = sub1.`VersionStart`
  //WHERE T.Language != 0 AND T.`VersionEnd` != sub1.`VersionEnd`
-                                                $DbResult2 = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$this->System->User->Id.
-                                                                ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
-                                                                ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
-                                                if($DbResult2->num_rows > 0)
-                                                {
-                                                        // Update existed user translation
-                                                        $ExistedText = $DbResult2->fetch_assoc();
-                                                        $Values = '`Language` = '.$Language;
-        
-                                                        $UpdateModifyTime = false;
-                                                        $Completable = true;
-                                                        $CompleteParts = $ExistedText['CompleteParts'];
-                                                        foreach($Group['Items'] as $GroupItem)
-                                                        {
-                                                                if($GroupItem['Visible'] == 1)
-                                                                {
-                                                                        if($SourceText[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']])
-                                                                                $UpdateModifyTime = true;
-        
-                                                                        if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
-                                                                        {
-                                                                                if(array_key_exists($GroupItem['Column'], $_POST))
-                                                                                {
-                                                                                        $Values .= ', `'.$GroupItem['Column'].'` = "'.$_POST[$GroupItem['Column']].'"';
-                                                                                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                                                                                }
-                                                                        }
-                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and 
-                                                                          ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
-                                                                }
-                                                        }
-                                                        if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-                                                        else $NewComplete = 0;
-                                                        if($SourceText['ID'] == $ExistedText['ID'])
-                                                        {
-                                                                $NewComplete = $Complete; // Our original user text, set complete according user choice
-                                                                if($Complete == 1)
-                                                                {
-                                                                        foreach($Group['Items'] as $GroupItem)
-                                                                                if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                                                                }
-                                                        }
-                                                        $Values .= ', `Complete`='.$NewComplete.', `CompleteParts` = '.$CompleteParts;
-        
-                                                        if($UpdateModifyTime) $Values .= ', `ModifyTime` = NOW()';
-        
-                                                        // Update user translation
-                                                        $this->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
-        
-                                                        $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
-                                                {
-                                                        // Insert new user translation
-                                                        $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
-                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
-                                                          $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$EnglishFound['ID'].', NOW()';
-        
-                                                        $CompleteParts = 0;
-                                                        $Completable = true;
+              $DbResult2 = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$this->System->User->Id.
+                  ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
+                  ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
+              if($DbResult2->num_rows > 0)
+              {
+                // Update existed user translation
+                $ExistedText = $DbResult2->fetch_assoc();
+                $Values = '`Language` = '.$Language;
+
+                $UpdateModifyTime = false;
+                $Completable = true;
+                $CompleteParts = $ExistedText['CompleteParts'];
+                foreach($Group['Items'] as $GroupItem)
+                {
+                  if($GroupItem['Visible'] == 1)
+                  {
+                    if($SourceText[$GroupItem['Column']] != $ExistedText[$GroupItem['Column']])
+                      $UpdateModifyTime = true;
+
+                    if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+                    {
+                      if(array_key_exists($GroupItem['Column'], $_POST))
+                      {
+                        $Values .= ', `'.$GroupItem['Column'].'` = "'.$_POST[$GroupItem['Column']].'"';
+                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                      }
+                    }
+                    if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and
+                      ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                  }
+                }
+                if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+                else $NewComplete = 0;
+                if($SourceText['ID'] == $ExistedText['ID'])
+                {
+                  $NewComplete = $Complete; // Our original user text, set complete according user choice
+                  if($Complete == 1)
+                  {
+                    foreach($Group['Items'] as $GroupItem)
+                      if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                  }
+                }
+                $Values .= ', `Complete`='.$NewComplete.', `CompleteParts` = '.$CompleteParts;
+
+                if($UpdateModifyTime) $Values .= ', `ModifyTime` = NOW()';
+
+                // Update user translation
+                $this->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
+
+                $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
+              {
+                // Insert new user translation
+                $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
+                $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.
+                  $EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$EnglishFound['ID'].', NOW()';
+
+                $CompleteParts = 0;
+                $Completable = true;
                 $OnlyRank = true;
-                                                        foreach($Group['Items'] as $GroupItem)
-                                                        {
-                                                                $Columns .= ', `'.$GroupItem['Column'].'`';
-                                                                if($GroupItem['Visible'] == 1)
-                                                                {
-                                                                        if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
-                                                                        {
-                                                                                // Read form user data
-                                                                                if(array_key_exists($GroupItem['Column'], $_POST))
-                                                                                {
-                        if (44 <> $GroupItem['Id']) $OnlyRank = false; 
-                                                                                        $Values .= ', "'.$_POST[$GroupItem['Column']].'"';
-                                                                                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                                                                                } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
-                                                                        } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
-                                                                        if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
-                                                                } else
-                                                                {
-                                                                        // Read from english text
-                                                                        $Values .= ', "'.$EnglishFound[$GroupItem['Column']].'"';
-                                                                }
-                                                        }
-                                                        if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
-                                                        else $NewComplete = 0;
-                                                        if($SourceText['ID'] == $EnglishFound['ID'])
-                                                        {
-                                                                $NewComplete = $Complete; // Our original user text, set complete according user choice
-                                                                if($Complete == 1)
-                                                                {
-                                                                        foreach($Group['Items'] as $GroupItem)
-                                                                                if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
-                                                                }
-                                                        }
-                                                        $Columns .= ', `Complete`, `CompleteParts`';
-                                                        $Values .= ', '.$NewComplete.', '.$CompleteParts;
-        
-                if (!$OnlyRank) 
-                {
-                                                          $this->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
-                                                          $LastID = $this->Database->insert_id;
-        
-                                                          $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);
-                }
-                                                }
-                                        }
-                                } else $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
-                        } else $Output .= ShowMessage('Zadaná položka nenalezena.', MESSAGE_CRITICAL);
-                         
-                         
-                        // Address and redirecting
-                        $Output .= '<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0&entry=">Nepřeložené</a> ';
-        
-                        $prev = FollowingTran($TextID, $Table, $GroupId, True);
-                        $next = FollowingTran($TextID, $Table, $GroupId);
-                        $Output .= '<br /><br />';
-                        $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
-                        $redirecting = $DbResult->fetch_assoc();
-        
-                        switch($redirecting['Redirecting'])
-                        {
-                                case 1:
-                                        $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                                        'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0').'\'", 1500)'.
-                                                        '</script>';
-                                        break;
-                                case 2:
-                                        if($next <> '')
-                                                $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                                'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
-                                                '</script>';
-                                        break;
-                                case 3:
-                                        if($prev <> '')
-                                                $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
-                                                'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
-                                                '</script>';
-                                        break;
-                        }
-        
-                        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.
-                          $this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
-        
-                        // Update flag for experience info load
-                        $this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
-                } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
-        } else
-        {
-                if(array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST))
-                {
-                        $Output .= 'Byli jste automaticky odhlášeni. Pro <strong>Uložení překladu</strong> se musíte přihlásit zde:<br /><br />'.
-                                        '<form action="save.php?action=login&amp;group='.$GroupId.'" method="post"><div>'.
-                                        '<input type="hidden" name="entry" value="'.$_POST['entry'].'" />'.
-                                        '<input type="hidden" name="user" value="'.$_POST['user'].'" />'.
-                                        '<input type="hidden" name="ID" value="'.$_POST['ID'].'" />'.
-                                        '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';
-        
-                        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-                        {
-                                if(array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
-                                $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Value).'" />';
-                        }
-                        $Output .= '<table>'.
-                                        '<tr>'.
-                                        '<td>Jméno: <input type="text" name="LoginUser" size="13" /></td>'.
-                                        '</tr><tr>'.
-                                        '<td>Heslo: <input type="password" name="LoginPass" size="13" /></td>'.
-                                        '</tr><tr>'.
-                                        '<th><input type="submit" value="Přihlásit a uložit překlad" /></th>'.
-                                        '</tr>'.
-                                        '</table>';
-                } else $Output = ShowMessage('Nezadány požadované údaje.', MESSAGE_CRITICAL);
-        }        
-    return($Output);          
+                foreach($Group['Items'] as $GroupItem)
+                {
+                  $Columns .= ', `'.$GroupItem['Column'].'`';
+                  if($GroupItem['Visible'] == 1)
+                  {
+                    if($EnglishFound[$GroupItem['Column']] == $EnglishText[$GroupItem['Column']])
+                    {
+                      // Read form user data
+                      if(array_key_exists($GroupItem['Column'], $_POST))
+                      {
+                        if (44 <> $GroupItem['Id']) $OnlyRank = false;
+                        $Values .= ', "'.$_POST[$GroupItem['Column']].'"';
+                        $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                      } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
+                    } else $Values .= ', "'.addslashes($EnglishFound[$GroupItem['Column']]).'"';
+                    if((($CompleteParts & (1 << ($GroupItem['Sequence'] - 1))) == 0) and ($EnglishFound[$GroupItem['Column']] != '')) $Completable = false;
+                  } else
+                  {
+                    // Read from english text
+                    $Values .= ', "'.$EnglishFound[$GroupItem['Column']].'"';
+                  }
+                }
+                if($Completable) $NewComplete = 1; // All parts of text are completed. Make entire text as completed
+                else $NewComplete = 0;
+                if($SourceText['ID'] == $EnglishFound['ID'])
+                {
+                  $NewComplete = $Complete; // Our original user text, set complete according user choice
+                  if($Complete == 1)
+                  {
+                    foreach($Group['Items'] as $GroupItem)
+                      if($GroupItem['Visible'] == 1) $CompleteParts |= (1 << ($GroupItem['Sequence'] - 1));
+                  }
+                }
+                $Columns .= ', `Complete`, `CompleteParts`';
+                $Values .= ', '.$NewComplete.', '.$CompleteParts;
+
+                if (!$OnlyRank)
+                {
+                  $this->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+                  $LastID = $this->Database->insert_id;
+
+                  $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);
+                }
+              }
+            }
+          } else $Output .= ShowMessage('Anglický originál k překladu nenalezen.', MESSAGE_CRITICAL);
+        } else $Output .= ShowMessage('Zadaná položka nenalezena.', MESSAGE_CRITICAL);
+
+
+        // Address and redirecting
+        $Output .= '<br />Překládat: <a href="TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0&entry=">Nepřeložené</a> ';
+
+        $prev = FollowingTran($TextID, $Table, $GroupId, True);
+        $next = FollowingTran($TextID, $Table, $GroupId);
+        $Output .= '<br /><br />';
+        $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
+        $redirecting = $DbResult->fetch_assoc();
+
+        switch($redirecting['Redirecting'])
+        {
+          case 1:
+            $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+                'setTimeout("parent.location.href=\''.htmlspecialchars_decode('TranslationList.php?group='.$GroupId.'&amp;state=1&amp;user=0').'\'", 1500)'.
+                '</script>';
+            break;
+          case 2:
+            if($next <> '')
+              $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+              'setTimeout("parent.location.href=\''.htmlspecialchars_decode($next).'\'", 1500)'.
+              '</script>';
+            break;
+          case 3:
+            if($prev <> '')
+              $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+              'setTimeout("parent.location.href=\''.htmlspecialchars_decode($prev).'\'", 1500)'.
+              '</script>';
+            break;
+        }
+
+        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.
+          $this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+
+        // Update flag for experience info load
+        $this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
+      } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
+    } else
+    {
+      if(array_key_exists('ID', $_POST) and array_key_exists('entry', $_POST) and array_key_exists('Language', $_POST) and array_key_exists('user', $_POST))
+      {
+        $Output .= 'Byli jste automaticky odhlášeni. Pro <strong>Uložení překladu</strong> se musíte přihlásit zde:<br /><br />'.
+            '<form action="save.php?action=login&amp;group='.$GroupId.'" method="post"><div>'.
+            '<input type="hidden" name="entry" value="'.$_POST['entry'].'" />'.
+            '<input type="hidden" name="user" value="'.$_POST['user'].'" />'.
+            '<input type="hidden" name="ID" value="'.$_POST['ID'].'" />'.
+            '<input type="hidden" name="Language" value="'.$_POST['Language'].'" />';
+
+        foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+        {
+          if(array_key_exists($TextItem['Column'], $_POST)) $Value = $_POST[$TextItem['Column']]; else $Value = '';
+          $Output .= '<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Value).'" />';
+        }
+        $Output .= '<table>'.
+            '<tr>'.
+            '<td>Jméno: <input type="text" name="LoginUser" size="13" /></td>'.
+            '</tr><tr>'.
+            '<td>Heslo: <input type="password" name="LoginPass" size="13" /></td>'.
+            '</tr><tr>'.
+            '<th><input type="submit" value="Přihlásit a uložit překlad" /></th>'.
+            '</tr>'.
+            '</table>';
+      } else $Output = ShowMessage('Nezadány požadované údaje.', MESSAGE_CRITICAL);
+    }
+    return($Output);
   }
 }

trunk/Modules/Translation/Translation.php

@@ -23 +23 @@
   function Start()
   {
-        global $TranslationTree;
+    global $TranslationTree;
 
-                $this->System->RegisterPage('comparison.php', 'PageTranslationComparison');
-        $this->System->RegisterPage('form.php', 'PageTranslationForm');
-        $this->System->RegisterPage('save.php', 'PageTranslationSave');
-        $this->System->RegisterPage('progress', 'PageProgress');
+    $this->System->RegisterPage('comparison.php', 'PageTranslationComparison');
+    $this->System->RegisterPage('form.php', 'PageTranslationForm');
+    $this->System->RegisterPage('save.php', 'PageTranslationSave');
+    $this->System->RegisterPage('progress', 'PageProgress');
     $this->System->RegisterPage('TranslationList.php', 'PageTranslationList');
     $this->System->RegisterPage('LoadNames.php', 'PageLoadNames');
@@ -42 +42 @@
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
     {
-                  foreach($TranslationTree as $Group)
-                  {
-                          $Table = $Group['TablePrefix'];
+      foreach($TranslationTree as $Group)
+      {
+        $Table = $Group['TablePrefix'];
 
-                                $Columns = array('ID', 'Entry');
-                          foreach($Group['Items'] as $Item)
-                          {
-                                if($Item['Column'] != '') $Columns[] = $Item['Column'];
-                          }
+        $Columns = array('ID', 'Entry');
+        foreach($Group['Items'] as $Item)
+        {
+          if($Item['Column'] != '') $Columns[] = $Item['Column'];
+        }
 
         $this->System->ModuleManager->Modules['Search']->RegisterSearch('group'.$Group['Id'],
         sprintf(T('Translation group "%s"'), $Group['Name']), $Columns, '`'.$Table.'`', $this->System->Link('/TranslationList.php?group='.
         $Group['Id'].'&user=0&state=0&entry=&text='));
-                }
+      }
     }
   }
@@ -61 +61 @@
   function ShowRSS()
   {
-        $Items = array();
+    $Items = array();
     $DbResult = $this->Database->query('SELECT UNIX_TIMESTAMP(`Date`) AS `Date`, `User`.`Name` AS `UserName`, `Text` FROM `Log` '.
     'JOIN `User` ON `User`.`ID` = `Log`.`User` WHERE `Type` = 1 ORDER BY `Date` DESC LIMIT 100');
@@ -81 +81 @@
       'WebmasterEmail' => $this->System->Config['Web']['AdminEmail'],
       'Items' => $Items,
-                ));
+    ));
     return($Output);
   }

trunk/Modules/Translation/TranslationList.php

@@ -3 +3 @@
 class CompletionState
 {
-        const All = 0;
-        const NotTranslated = 1;
-        const Translated = 2;
-        const NotFinished = 3;
-        const Original = 4;
-        const NotFinishedNotTranslated = 5;
-        const Missing1 = 6;
-        const Missing2 = 7;
+  const All = 0;
+  const NotTranslated = 1;
+  const Translated = 2;
+  const NotFinished = 3;
+  const Original = 4;
+  const NotFinishedNotTranslated = 5;
+  const Missing1 = 6;
+  const Missing2 = 7;
 }
 
@@ -16 +16 @@
 class PageTranslationList extends Page
 {
-        function ShowFilter($GroupId = 0)
-        {
-                global $TranslationTree;
-
-                $Filter = array('SQL' => '');
-
-                $Output = '<form action="?" method="post">'.
-                                '<table class="BaseTable"><tr>'.
-                                '<th>Zpracování</th>'.
-                                '<th>Skupina</th>'.
-                                '<th>Verze</th>'.
-                                '<th>Jazyk</th>'.
-                                '<th>Překladatel</th>'.
-                                '<th>Slova</th>'.
-                                '<th>Položka</th>'.
-                                '<th></th></tr><tr>';
-
-                // State
-                $Filter['State'] = GetParameter('state', 0, true, true);
-                $Output .= '<td><select name="state">';
-                $StateTypes = array(
-                  CompletionState::All => 'Všechny',
+  function ShowFilter($GroupId = 0)
+  {
+    global $TranslationTree;
+
+    $Filter = array('SQL' => '');
+
+    $Output = '<form action="?" method="post">'.
+        '<table class="BaseTable"><tr>'.
+        '<th>Zpracování</th>'.
+        '<th>Skupina</th>'.
+        '<th>Verze</th>'.
+        '<th>Jazyk</th>'.
+        '<th>Překladatel</th>'.
+        '<th>Slova</th>'.
+        '<th>Položka</th>'.
+        '<th></th></tr><tr>';
+
+    // State
+    $Filter['State'] = GetParameter('state', 0, true, true);
+    $Output .= '<td><select name="state">';
+    $StateTypes = array(
+      CompletionState::All => 'Všechny',
       CompletionState::NotTranslated => 'Nepřeložené',
       CompletionState::Translated => 'Přeložené',
@@ -46 +46 @@
       CompletionState::Missing2 => 'Chybějící $-Neopravený'
     );
-                foreach ($StateTypes as $index=>$StateType) {
-                if($Filter['State'] == $index) $Selected = ' selected="selected"';
-                else $Selected = '';
-                  $Output .= '<option value="'.$index.'"'.$Selected.'>'.$StateType.'</option>';
-    }
-                $Output .= '</select></td>';
-
-                // Translation group
-                if($GroupId == 0)
-                {
-                        $Filter['Group'] = GetParameter('group', 0, true, true);
-                        if($Filter['Group'] != 0)
-                        {
-                                if(isset($TranslationTree[$Filter['Group']]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
-                                $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-                        }
-                } else
-                {
-                        $Filter['Group'] = $GroupId;
-                        $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-                }
-
-                $Output .= '<td><select name="group" style="width: 80px">';
-                if($Filter['Group'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-                $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
-                while($Group = $DbResult->fetch_assoc())
-                {
-                        if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
-                        else $Selected = '';
-                        $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.$Group['Name'].'</option>';
-                }
-                $Output .= '</select></td>';
+    foreach ($StateTypes as $index=>$StateType) {
+      if($Filter['State'] == $index) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="'.$index.'"'.$Selected.'>'.$StateType.'</option>';
+    }
+    $Output .= '</select></td>';
+
+    // Translation group
+    if($GroupId == 0)
+    {
+      $Filter['Group'] = GetParameter('group', 0, true, true);
+      if($Filter['Group'] != 0)
+      {
+        if(isset($TranslationTree[$Filter['Group']]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
+        $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+      }
+    } else
+    {
+      $Filter['Group'] = $GroupId;
+      $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+    }
+
+    $Output .= '<td><select name="group" style="width: 80px">';
+    if($Filter['Group'] == 0) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+    $DbResult = $this->Database->query('SELECT `Id`,`Name` FROM `Group` ORDER BY `Name`');
+    while($Group = $DbResult->fetch_assoc())
+    {
+      if($Group['Id'] == $Filter['Group']) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="'.$Group['Id'].'"'.$Selected.'>'.$Group['Name'].'</option>';
+    }
+    $Output .= '</select></td>';
 
     if ($this->System->User->Licence(LICENCE_USER))
-                $Filter['Version'] = GetParameter('version', $this->System->User->PreferredVersion, true, true);
-    else 
-                $Filter['Version'] = GetParameter('version', 0, true, true);
-                if($Filter['Version'] != 0)
-                {
-                        $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
-                        if($DbResult->num_rows > 0)
-                        {
-                                $DbRow = $DbResult->fetch_assoc();
-                                $Filter['BuildNumber'] = $DbRow['BuildNumber'];
-                        } else ErrorMessage('Zadaná verze klienta nenalezena');
-                }
-                $Output .= '<td><select name="version">';
-                if($Filter['Version'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-                $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
-                while($Version = $DbResult->fetch_assoc())
-                {
-                        if($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
-                        else $Selected = '';
-                        $Output .= '<option value="'.$Version['Id'].'"'.$Selected.'>'.$Version['Version'].'</option>';
-                }
-                $Output .= '</select></td>';
-                if($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
-                else $VersionFilter = '';
-                //else $Filter['SQL'] .= ' AND '; DISTINCT(Entry)
-
-                // Language
-                $Filter['Language'] = GetParameter('lang', 0, true, true);
-                $Output .= '<td><select name="lang">';
-                if($Filter['Language'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
-                $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
-                while($Language = $DbResult->fetch_assoc())
-                {
-                        if($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
-                        else $Selected = '';
-                        $Output .= '<option value="'.$Language['Id'].'"'.$Selected.'>'.$Language['Name'].'</option>';
-                }
-                $Output .= '</select></td>';
-                $LanguageFilter = '';
-                $LanguageFilterSub = '';
-                if($Filter['Language'] != 0) {
+      $Filter['Version'] = GetParameter('version', $this->System->User->PreferredVersion, true, true);
+    else
+      $Filter['Version'] = GetParameter('version', 0, true, true);
+    if($Filter['Version'] != 0)
+    {
+      $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE (`Imported` = 1) AND (`Id` ='.$Filter['Version'].')');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_assoc();
+        $Filter['BuildNumber'] = $DbRow['BuildNumber'];
+      } else ErrorMessage('Zadaná verze klienta nenalezena');
+    }
+    $Output .= '<td><select name="version">';
+    if($Filter['Version'] == 0) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+    $DbResult = $this->Database->query('SELECT `Id`, `BuildNumber`,`Version` FROM `ClientVersion` WHERE `Imported` = 1 ORDER BY `BuildNumber` DESC');
+    while($Version = $DbResult->fetch_assoc())
+    {
+      if($Version['Id'] == $Filter['Version']) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="'.$Version['Id'].'"'.$Selected.'>'.$Version['Version'].'</option>';
+    }
+    $Output .= '</select></td>';
+    if($Filter['Version'] != 0) $VersionFilter = ' AND (`VersionStart` <= '.$Filter['BuildNumber'].') AND (`VersionEnd` >= '.$Filter['BuildNumber'].')';
+    else $VersionFilter = '';
+    //else $Filter['SQL'] .= ' AND '; DISTINCT(Entry)
+
+    // Language
+    $Filter['Language'] = GetParameter('lang', 0, true, true);
+    $Output .= '<td><select name="lang">';
+    if($Filter['Language'] == 0) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="0"'.$Selected.'>Všechny</option>';
+    $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Language` WHERE `Enabled` = 1 ORDER BY `Name`');
+    while($Language = $DbResult->fetch_assoc())
+    {
+      if($Language['Id'] == $Filter['Language']) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="'.$Language['Id'].'"'.$Selected.'>'.$Language['Name'].'</option>';
+    }
+    $Output .= '</select></td>';
+    $LanguageFilter = '';
+    $LanguageFilterSub = '';
+    if($Filter['Language'] != 0) {
       $LanguageFilter = ' AND (`T`.`Language` = '.$Filter['Language'].')';
       $LanguageFilterSub = ' AND (`Sub`.`Language` = '.$Filter['Language'].')';
     }
 
-                // User
-                $Filter['User'] = GetParameter('user', 0, true, true);
-                $Output .= '<td><select name="user" style="width: 80px">';
-                if($Filter['User'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všichni</option>';
-                $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
-                while($User = $DbResult->fetch_assoc())
-                {
-                        if($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
-                        else $Selected = '';
-                        $Output .= '<option value="'.$User['Id'].'"'.$Selected.'>'.$User['Name'].'</option>';
-                }
-                $Output .= '</select></td>';
-                if($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
-                else $UserFilter = '';
-
-                // Words
-                $Filter['Text'] = GetParameter('text', '', false, true);
-                $Output .= '<td><input name="text" type="text" style="width: 60px;" value="'.htmlentities($Filter['Text']).'"></td>';
-                if($Filter['Text'] != '')
-                {
-                        $Items = array('(`T`.`ID` LIKE "%'.$Filter['Text'].'%")', '(`T`.`Entry` LIKE "%'.$Filter['Text'].'%")');
-                        if($Filter['Group'] != 0)
-                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-                                if($GroupItem['Visible'] == 1)
-                                $Items[] = '(`T`.`'.$GroupItem['Column'].'` LIKE "%'.$Filter['Text'].'%")';
-                        $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).')';
-                }
-
-                // Entry
-                $Filter['Entry'] = GetParameter('entry', '', false, true);
-                $Output .= '<td><input name="entry" type="text" style="width: 60px;" value="'.htmlentities($Filter['Entry']).'"></td>';
-                if($Filter['Entry'] != '')
-                {
-                        $Filter['SQL'] .= ' AND (`Entry` = "'.$Filter['Entry'].'")';
-                }
-
-                if($Filter['Group'] != 0)
-                {
-                    $WithoutAlter =       ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilterSub.
-                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`ID` != `T`.`ID`) AND (`Sub`.`Complete` = 1) AND '.
-                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`) LIMIT 1 ) ';
-                                foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
-                                if($GroupItem['Visible'] == 1) {
-                                $ItemsVar[] =    'LENGTH(`T`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `T`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) '.
+    // User
+    $Filter['User'] = GetParameter('user', 0, true, true);
+    $Output .= '<td><select name="user" style="width: 80px">';
+    if($Filter['User'] == 0) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="0"'.$Selected.'>Všichni</option>';
+    $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `User` ORDER BY `Name`');
+    while($User = $DbResult->fetch_assoc())
+    {
+      if($User['Id'] == $Filter['User']) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="'.$User['Id'].'"'.$Selected.'>'.$User['Name'].'</option>';
+    }
+    $Output .= '</select></td>';
+    if($Filter['User'] != 0) $UserFilter = ' AND (`User` = '.$Filter['User'].')';
+    else $UserFilter = '';
+
+    // Words
+    $Filter['Text'] = GetParameter('text', '', false, true);
+    $Output .= '<td><input name="text" type="text" style="width: 60px;" value="'.htmlentities($Filter['Text']).'"></td>';
+    if($Filter['Text'] != '')
+    {
+      $Items = array('(`T`.`ID` LIKE "%'.$Filter['Text'].'%")', '(`T`.`Entry` LIKE "%'.$Filter['Text'].'%")');
+      if($Filter['Group'] != 0)
+        foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+        if($GroupItem['Visible'] == 1)
+        $Items[] = '(`T`.`'.$GroupItem['Column'].'` LIKE "%'.$Filter['Text'].'%")';
+      $Filter['SQL'] .= ' AND ('.implode(' OR ', $Items).')';
+    }
+
+    // Entry
+    $Filter['Entry'] = GetParameter('entry', '', false, true);
+    $Output .= '<td><input name="entry" type="text" style="width: 60px;" value="'.htmlentities($Filter['Entry']).'"></td>';
+    if($Filter['Entry'] != '')
+    {
+      $Filter['SQL'] .= ' AND (`Entry` = "'.$Filter['Entry'].'")';
+    }
+
+    if($Filter['Group'] != 0)
+    {
+        $WithoutAlter =       ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+          '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].')'.$LanguageFilterSub.
+          ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`ID` != `T`.`ID`) AND (`Sub`.`Complete` = 1) AND '.
+          '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`) LIMIT 1 ) ';
+        foreach($TranslationTree[$Filter['Group']]['Items'] as $GroupItem)
+          if($GroupItem['Visible'] == 1) {
+            $ItemsVar[] =    'LENGTH(`T`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `T`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) '.
                            ' < ('.
                                           'SELECT LENGTH(`Sub`.`'.$GroupItem['Column'].'`) - LENGTH( REPLACE( `Sub`.`'.$GroupItem['Column'].'`,  \'$\',  \'\' ) ) FROM `'.$Table.'` AS `Sub` WHERE '.
-                                                                        ' `Sub`.`Entry` = `T`.`Entry` AND `Sub`.`Language` = '.$this->System->Config['OriginalLanguage'].' AND '.
-                                                                        '`Sub`.`VersionStart` = `T`.`VersionStart` AND `Sub`.`VersionEnd` = `T`.`VersionEnd` LIMIT 1 '.
+                                          ' `Sub`.`Entry` = `T`.`Entry` AND `Sub`.`Language` = '.$this->System->Config['OriginalLanguage'].' AND '.
+                                          '`Sub`.`VersionStart` = `T`.`VersionStart` AND `Sub`.`VersionEnd` = `T`.`VersionEnd` LIMIT 1 '.
                               ')';
-                      }
-                        if($Filter['State'] == CompletionState::All) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
-                        else if($Filter['State'] == CompletionState::NotTranslated) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
-                                        'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
-                                        '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].') '.$LanguageFilterSub.$UserFilter.
-                                        ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
-                                        '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
-                        else if($Filter['State'] == CompletionState::Translated) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
-                        else if($Filter['State'] == CompletionState::NotFinished) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
-                        ') AND (`T`.`Complete` = 0)';
-                        else if($Filter['State'] == CompletionState::Original) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
-                        else if($Filter['State'] == CompletionState::NotFinishedNotTranslated) $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
+          }
+      if($Filter['State'] == CompletionState::All) $Filter['SQL'] .= $UserFilter.$VersionFilter.'';
+      else if($Filter['State'] == CompletionState::NotTranslated) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].') '.
+          'AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE '.
+          '(`Sub`.`Language` <> '.$this->System->Config['OriginalLanguage'].') '.$LanguageFilterSub.$UserFilter.
+          ' AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND '.
+          '(`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))';
+      else if($Filter['State'] == CompletionState::Translated) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Complete` = 1)';
+      else if($Filter['State'] == CompletionState::NotFinished) $Filter['SQL'] .= $UserFilter.$LanguageFilter.$VersionFilter.' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
+      ') AND (`T`.`Complete` = 0)';
+      else if($Filter['State'] == CompletionState::Original) $Filter['SQL'] .= $VersionFilter.' AND (`T`.`Language` = '.$this->System->Config['OriginalLanguage'].')';
+      else if($Filter['State'] == CompletionState::NotFinishedNotTranslated) $Filter['SQL'] .= $UserFilter.$VersionFilter.$WithoutAlter.
       ' AND (`T`.`Language` != '.$this->System->Config['OriginalLanguage'].
-                        ') AND (`T`.`Complete` = 0)'.
+      ') AND (`T`.`Complete` = 0)'.
           '';
-                        else if($Filter['State'] == CompletionState::Missing1) {
+      else if($Filter['State'] == CompletionState::Missing1) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';
-                  }
-                        else if($Filter['State'] == CompletionState::Missing2) {
+      }
+      else if($Filter['State'] == CompletionState::Missing2) {
         $Filter['SQL'] .= $UserFilter.$VersionFilter.' AND (`T`.`Complete` = 1) AND `T`.`Language` != '.$this->System->Config['OriginalLanguage'];
         $Filter['SQL'] .= ' '. $WithoutAlter;
         $Filter['SQL'] .= ' AND ('.implode(' OR ', $ItemsVar).') ';
-                  }
-                }
-
-                /*
-                 // Ownership
-                if(array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner'];
-                else $Filter['Owner'] = 0;
-                $Output .= ' <td><select name="owner">';
-                if($Filter['Owner'] == 0) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="0"'.$Selected.'>Všech</option>';
-                if($Filter['Owner'] == 1) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="1"'.$Selected.'>Překladatelův tým</option>';
-                if($Filter['Owner'] == 2) $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<option value="2"'.$Selected.'>Překladatele</option>';
-                $Output .= '</select></td>';
-                if(($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
-                */
-
-                $Output .= '<td><input type="submit" value="Filtrovat"/></td>';
-                $Output .= '</tr></table>';
-                $Output .= '</form><br/>';
-                $Filter['Output'] = $Output;
-                return($Filter);
-        }
-
-        function ShowTranslationList($Filter)
-        {
-                global $TranslationTree;
-
-                $Output = $Filter['Output'];
-                $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
-
-                $Query = 'SELECT `T`.`ModifyTime`, `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
-                                '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
-                                '`User`.`Name` AS `UserName`, `User`.`ID` AS `UserId`, '.
-                                '`Language`.`Name` AS `LanguageName`, `TS`.`Version` AS `VersionStartText`, `TE`.`Version` AS `VersionEndText` '.
-                                'FROM `'.$Table.'` AS `T` '.
-                                'LEFT JOIN `User` ON `User`.`ID` = `T`.`User` '.
-                                'LEFT JOIN `Language` ON `Language`.`ID` = `T`.`Language` '.
-                                'LEFT JOIN `ClientVersion` AS `TS` ON `TS`.`BuildNumber` = `T`.`VersionStart` '.
-                                'LEFT JOIN `ClientVersion` AS `TE` ON `TE`.`BuildNumber` = `T`.`VersionEnd` '.
-                                'WHERE 1 '.$Filter['SQL'];
-
-                // Get total item count
-                $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-
-                $Output .= $PageList['Output'];
-                $TableColumns = array(
-                                array('Name' => 'ID', 'Title' => 'Číslo'),
-                                array('Name' => 'Entry', 'Title' => 'Položka'),
-                                array('Name' => $TranslationTree[$Filter['Group']]['Items'][0]['Column'], 'Title' => 'Název'),
-                                array('Name' => 'VersionStart', 'Title' => 'Verze'),
-                                array('Name' => 'LanguageName', 'Title' => 'Jazyk'),
-                                array('Name' => 'UserName', 'Title' => 'Překladatel'),
-                                array('Name' => 'ModifyTime', 'Title' => 'Datum'),
-                );
-
-                $Order = GetOrderTableHeader($TableColumns, 'VersionStart', 1);
-                $Output .= '<table class="BaseTable">'.
-                                $Order['Output'];
-
-                $DbResult = $this->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
-                while($Line = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<tr><td><a href="form.php?group='.$Filter['Group'].'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
-                                        '<td>'.htmlspecialchars($Line[$TranslationTree[$Filter['Group']]['Items'][0]['Column']]).'</td>'.
-                                        '<td>'.$Line['VersionStartText'].'-'.$Line['VersionEndText'].'</td>'.
-                                        '<td>'.$Line['LanguageName'].'</td>'.
-                                        '<td><a href="user.php?user='.$Line['UserId'].'">'.$Line['UserName'].'</a></td>'.
-                                        '<td>'.HumanDate($Line['ModifyTime']).'</td>'
+      }
+    }
+
+    /*
+     // Ownership
+    if(array_key_exists('owner', $_GET) and is_numeric($_GET['owner'])) $Filter['Owner'] = $_GET['owner'];
+    else $Filter['Owner'] = 0;
+    $Output .= ' <td><select name="owner">';
+    if($Filter['Owner'] == 0) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="0"'.$Selected.'>Všech</option>';
+    if($Filter['Owner'] == 1) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="1"'.$Selected.'>Překladatelův tým</option>';
+    if($Filter['Owner'] == 2) $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<option value="2"'.$Selected.'>Překladatele</option>';
+    $Output .= '</select></td>';
+    if(($Filter['Owner'] == 2) AND ($Filter['User'] != 0)) $Filter['SQL'] .= ' AND (`User` = '.$Filter['User'].')';
+    */
+
+    $Output .= '<td><input type="submit" value="Filtrovat"/></td>';
+    $Output .= '</tr></table>';
+    $Output .= '</form><br/>';
+    $Filter['Output'] = $Output;
+    return($Filter);
+  }
+
+  function ShowTranslationList($Filter)
+  {
+    global $TranslationTree;
+
+    $Output = $Filter['Output'];
+    $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
+
+    $Query = 'SELECT `T`.`ModifyTime`, `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
+        '`T`.`'.$TranslationTree[$Filter['Group']]['Items'][0]['Column'].'`, '.
+        '`User`.`Name` AS `UserName`, `User`.`ID` AS `UserId`, '.
+        '`Language`.`Name` AS `LanguageName`, `TS`.`Version` AS `VersionStartText`, `TE`.`Version` AS `VersionEndText` '.
+        'FROM `'.$Table.'` AS `T` '.
+        'LEFT JOIN `User` ON `User`.`ID` = `T`.`User` '.
+        'LEFT JOIN `Language` ON `Language`.`ID` = `T`.`Language` '.
+        'LEFT JOIN `ClientVersion` AS `TS` ON `TS`.`BuildNumber` = `T`.`VersionStart` '.
+        'LEFT JOIN `ClientVersion` AS `TE` ON `TE`.`BuildNumber` = `T`.`VersionEnd` '.
+        'WHERE 1 '.$Filter['SQL'];
+
+    // Get total item count
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM ('.$Query.') AS `TT`');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'];
+    $TableColumns = array(
+        array('Name' => 'ID', 'Title' => 'Číslo'),
+        array('Name' => 'Entry', 'Title' => 'Položka'),
+        array('Name' => $TranslationTree[$Filter['Group']]['Items'][0]['Column'], 'Title' => 'Název'),
+        array('Name' => 'VersionStart', 'Title' => 'Verze'),
+        array('Name' => 'LanguageName', 'Title' => 'Jazyk'),
+        array('Name' => 'UserName', 'Title' => 'Překladatel'),
+        array('Name' => 'ModifyTime', 'Title' => 'Datum'),
+    );
+
+    $Order = GetOrderTableHeader($TableColumns, 'VersionStart', 1);
+    $Output .= '<table class="BaseTable">'.
+        $Order['Output'];
+
+    $DbResult = $this->Database->query($Query.' '.$Order['SQL'].' '.$PageList['SQLLimit']);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $Output .= '<tr><td><a href="form.php?group='.$Filter['Group'].'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
+          '<td>'.htmlspecialchars($Line[$TranslationTree[$Filter['Group']]['Items'][0]['Column']]).'</td>'.
+          '<td>'.$Line['VersionStartText'].'-'.$Line['VersionEndText'].'</td>'.
+          '<td>'.$Line['LanguageName'].'</td>'.
+          '<td><a href="user.php?user='.$Line['UserId'].'">'.$Line['UserName'].'</a></td>'.
+          '<td>'.HumanDate($Line['ModifyTime']).'</td>'
           ;
-                        '</tr>';
-                }
-                $Output .= '</table>'.
-                                $PageList['Output'];
-                return($Output);
-        }
-
-        function ShowGroupList($Filter)
-        {
-                global $TranslationTree;
-
-          $Output = $Filter['Output'];
-
-                $Output .= '<table class="BaseTable"><tr><th>Skupina</th><th>Počet</th></tr>';
-                $Total = 0;
-                foreach($TranslationTree as $Group)
-                        if($Group['TablePrefix'] != '')
-                        {
-                                $Filter = $this->ShowFilter($Group['Id']);
-                                $ID = $this->Database->query('SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` AS `T` WHERE 1 '.$Filter['SQL']);
-                                $Line = $ID->fetch_row();
-                                if ($Line[0] <> '0')
-                                  $Output .= '<tr><td><a href="?group='.$Group['Id'].'">'.$Group['Name'].'</td><td>'.$Line[0].'</a></tr>';
-                                $Total += $Line[0];
-                        }
-                        $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr>'.
-                                        '</table>';
-                        return($Output);
-        }
-
-        function ShowGroupTypeList()
-        {
-                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Group`');
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-                $Output = '<h3>Seznam překladových skupin</h3>'.
-                                $PageList['Output'];
-
-                $Output .= '<table class="BaseTable">';
-                $TableColumns = array(
-                                array('Name' => 'Name', 'Title' => 'Jméno'),
-                                array('Name' => 'SourceType', 'Title' => 'Typ zdroje'),
-                                array('Name' => '', 'Title' => 'Zdroje'),
-                                array('Name' => 'LastImport', 'Title' => 'Datum posledního importu'),
-                                array('Name' => 'LastVersion', 'Title' => 'Verze posledního importu'),
-                );
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                  $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
-
-                $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
-                $Output .= $Order['Output'];
-
-                $DbResult = $this->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
-                while($Group = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<tr><td><a href="?group='.$Group['Id'].'&amp;action=filter">'.$Group['Name'].'</a></td><td>'.$Group['SourceType'].'</td><td>';
-                        if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
-                        if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
-                        if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
-                        $Output .= '</td>';
+      '</tr>';
+    }
+    $Output .= '</table>'.
+        $PageList['Output'];
+    return($Output);
+  }
+
+  function ShowGroupList($Filter)
+  {
+    global $TranslationTree;
+
+    $Output = $Filter['Output'];
+
+    $Output .= '<table class="BaseTable"><tr><th>Skupina</th><th>Počet</th></tr>';
+    $Total = 0;
+    foreach($TranslationTree as $Group)
+      if($Group['TablePrefix'] != '')
+      {
+        $Filter = $this->ShowFilter($Group['Id']);
+        $ID = $this->Database->query('SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` AS `T` WHERE 1 '.$Filter['SQL']);
+        $Line = $ID->fetch_row();
+        if ($Line[0] <> '0')
+          $Output .= '<tr><td><a href="?group='.$Group['Id'].'">'.$Group['Name'].'</td><td>'.$Line[0].'</a></tr>';
+        $Total += $Line[0];
+      }
+      $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Total.'</strong></td></tr>'.
+          '</table>';
+      return($Output);
+  }
+
+  function ShowGroupTypeList()
+  {
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `Group`');
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+    $Output = '<h3>Seznam překladových skupin</h3>'.
+        $PageList['Output'];
+
+    $Output .= '<table class="BaseTable">';
+    $TableColumns = array(
+        array('Name' => 'Name', 'Title' => 'Jméno'),
+        array('Name' => 'SourceType', 'Title' => 'Typ zdroje'),
+        array('Name' => '', 'Title' => 'Zdroje'),
+        array('Name' => 'LastImport', 'Title' => 'Datum posledního importu'),
+        array('Name' => 'LastVersion', 'Title' => 'Verze posledního importu'),
+    );
+    if($this->System->User->Licence(LICENCE_ADMIN))
+      $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
+
+    $Order = GetOrderTableHeader($TableColumns, 'Name', 0);
+    $Output .= $Order['Output'];
+
+    $DbResult = $this->Database->query('SELECT * FROM `Group`'.$Order['SQL'].$PageList['SQLLimit']);
+    while($Group = $DbResult->fetch_assoc())
+    {
+      $Output .= '<tr><td><a href="?group='.$Group['Id'].'&amp;action=filter">'.$Group['Name'].'</a></td><td>'.$Group['SourceType'].'</td><td>';
+      if($Group['MangosTable'] != '') $Output .= $Group['MangosTable'].'.sql ';
+      if($Group['DBCFileName'] != '') $Output .= $Group['DBCFileName'].'.dbc ';
+      if($Group['LuaFileName'] != '') $Output .= $Group['LuaFileName'].'.lua ';
+      $Output .= '</td>';
       if($this->System->User->Licence(LICENCE_ADMIN))
         $Output .= '<td><a title="Změny po posledním importu u vybrané překladové skupiny" href="log.php?group='.
-                                  $Group['Id'].'&amp;type=11">'.HumanDate($Group['LastImport']).'</a></td>';
+          $Group['Id'].'&amp;type=11">'.HumanDate($Group['LastImport']).'</a></td>';
         else $Output .= '<td>'.HumanDate($Group['LastImport']).'</td>';
       $Output .= '<td><a href="'.$this->System->Link('/client-version/?action=item&amp;id='.
         GetVersionWOWId($Group['LastVersion'])).'">'.GetVersionWOW($Group['LastVersion']).'</a></td>';
-                  if($this->System->User->Licence(LICENCE_ADMIN))
-                    $Output .= '<td><a href="?action=groupdelete&amp;id='.$Group['Id'].'">Smazat</a></td>';
-                  $Output .= '</tr>';
-
-                }
-                $Output .= '</table>'.
-                                '<br /><a title="Záznam změn po importu" href="log.php?type=11">Záznam změn v textech při importu</a><br/>';
-                if($this->System->User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">Přidat překladovou skupinu</a>';
-                return($Output);
-        }
-
-        function ShowMenu()
-        {
-                global $TranslationTree;
-
-                $GroupId = GetParameter('group', 0, true);
-                if($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
-                else {
-                        $Table = $TranslationTree[$GroupId]['TablePrefix'];
-
-                        $Output = '<h3>Základní filtrování textů</h3><br/>'.
-                                        '<table class="BaseTable"><tr><th>Odkaz</th><th>Popis</th></tr>'.
-                                        '<tr><td><a title="Všechny dostupné texty ve skupině" href="?group='.$GroupId.'&amp;state=4">Všechny</a></td>'.
-                                        '<td>Zobrazit všechny dostupné anglické texty ve skupině.</td></tr>'.
-                                        '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$GroupId.'&amp;state=2">Přeložené</a></td>'.
-                                        '<td>Zobrazit pouze již přeložené texty.</td></tr>'.
-                                        '<tr><td><a title="Nepřeložené texty" href="?group='.$GroupId.'&amp;state=1">Nepřeložené</a></td>'.
-                                        '<td>Dosud nepřeložené texty, které je potřeba přeložit.</td></tr>'.
-                                        '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3">Nedokončené</a></td>'.
-                                        '<td>Texty označené jako rozpracované.</td></tr>';
-
-                        if($this->System->User->Licence(LICENCE_USER))
-                        {
-                                $Output .= '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3&amp;user='.$this->System->User->Id.'">Moje nedokončené</a></td>
-                                <td>Nedokončené texty přihlášeného uživatele</td></tr>
-                                <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$GroupId.'&amp;state=2&amp;user='.$this->System->User->Id.'">Moje přeložené</a></td>
-                                <td>Přeložené texty přihlášeného uživatele</td></tr>';
-                        }
-
-                        $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;entry=" method="post"><div>'.
-                                        '<input type="text" name="text" size="8" />'.
-                                        '<input type="submit" value="Hledat" />'.
-                                        '</div></form>'.
-                                        '</td><td>Vyhledat pomocí textu</td></tr>';
-
-                        $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;text=" method="post"><div>'.
-                                        '<input type="text" name="entry" size="8" />'.
-                                        '<input type="submit" value="Hledat" />'.
-                                        '</div></form>'.
-                                        '</td><td>Zobrazit podle ID textu v databázi MaNGOSu</td></tr>';
-
-                        $Output .= '</table>';
-                }
-                return($Output);
-        }
-
-        function ShowGroupAdd()
-        {
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                        $Output = '<h3>Vložení nové překladové skupiny</h3>'.
-                                        '<form action="?action=groupaddfinish" method="post">'.
-                                        '<table>'.
-                                        '<tr><td>Název:</td><td><input type="text" name="Name"/></td></tr>'.
-                                        '<tr><td>Název tabulky v databázi:</td><td>Text<input type="text" name="TablePrefix"/></td></tr>'.
-                                        '<tr><td colspan="2"><input type="submit" name="add" value="Přidat"/></td></tr>'.
-                                        '</table></form>';
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-
-        function ShowGroupAddFinish()
-        {
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                        $TableName = 'Text'.$_POST['TablePrefix'];
-                        $DbResult = $this->System->Database->select('Group', 'Id', 'TablePrefix="'.$TableName.'"');
-                        if($DbResult->num_rows == 0)
-                  {
-
-                        $this->System->Database->query('CREATE TABLE IF NOT EXISTS `'.$TableName.'` (
+      if($this->System->User->Licence(LICENCE_ADMIN))
+        $Output .= '<td><a href="?action=groupdelete&amp;id='.$Group['Id'].'">Smazat</a></td>';
+      $Output .= '</tr>';
+
+    }
+    $Output .= '</table>'.
+        '<br /><a title="Záznam změn po importu" href="log.php?type=11">Záznam změn v textech při importu</a><br/>';
+    if($this->System->User->Licence(LICENCE_ADMIN)) $Output .= '<a href="?action=groupadd">Přidat překladovou skupinu</a>';
+    return($Output);
+  }
+
+  function ShowMenu()
+  {
+    global $TranslationTree;
+
+    $GroupId = GetParameter('group', 0, true);
+    if($GroupId == 0) $Output = ShowMessage('Skupina nenalezena', MESSAGE_CRITICAL);
+    else {
+      $Table = $TranslationTree[$GroupId]['TablePrefix'];
+
+      $Output = '<h3>Základní filtrování textů</h3><br/>'.
+          '<table class="BaseTable"><tr><th>Odkaz</th><th>Popis</th></tr>'.
+          '<tr><td><a title="Všechny dostupné texty ve skupině" href="?group='.$GroupId.'&amp;state=4">Všechny</a></td>'.
+          '<td>Zobrazit všechny dostupné anglické texty ve skupině.</td></tr>'.
+          '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$GroupId.'&amp;state=2">Přeložené</a></td>'.
+          '<td>Zobrazit pouze již přeložené texty.</td></tr>'.
+          '<tr><td><a title="Nepřeložené texty" href="?group='.$GroupId.'&amp;state=1">Nepřeložené</a></td>'.
+          '<td>Dosud nepřeložené texty, které je potřeba přeložit.</td></tr>'.
+          '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3">Nedokončené</a></td>'.
+          '<td>Texty označené jako rozpracované.</td></tr>';
+
+      if($this->System->User->Licence(LICENCE_USER))
+      {
+        $Output .= '<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;state=3&amp;user='.$this->System->User->Id.'">Moje nedokončené</a></td>
+        <td>Nedokončené texty přihlášeného uživatele</td></tr>
+        <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$GroupId.'&amp;state=2&amp;user='.$this->System->User->Id.'">Moje přeložené</a></td>
+        <td>Přeložené texty přihlášeného uživatele</td></tr>';
+      }
+
+      $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;entry=" method="post"><div>'.
+          '<input type="text" name="text" size="8" />'.
+          '<input type="submit" value="Hledat" />'.
+          '</div></form>'.
+          '</td><td>Vyhledat pomocí textu</td></tr>';
+
+      $Output .= '<tr><td><form action="?group='.$GroupId.'&amp;text=" method="post"><div>'.
+          '<input type="text" name="entry" size="8" />'.
+          '<input type="submit" value="Hledat" />'.
+          '</div></form>'.
+          '</td><td>Zobrazit podle ID textu v databázi MaNGOSu</td></tr>';
+
+      $Output .= '</table>';
+    }
+    return($Output);
+  }
+
+  function ShowGroupAdd()
+  {
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $Output = '<h3>Vložení nové překladové skupiny</h3>'.
+          '<form action="?action=groupaddfinish" method="post">'.
+          '<table>'.
+          '<tr><td>Název:</td><td><input type="text" name="Name"/></td></tr>'.
+          '<tr><td>Název tabulky v databázi:</td><td>Text<input type="text" name="TablePrefix"/></td></tr>'.
+          '<tr><td colspan="2"><input type="submit" name="add" value="Přidat"/></td></tr>'.
+          '</table></form>';
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowGroupAddFinish()
+  {
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $TableName = 'Text'.$_POST['TablePrefix'];
+      $DbResult = $this->System->Database->select('Group', 'Id', 'TablePrefix="'.$TableName.'"');
+      if($DbResult->num_rows == 0)
+      {
+
+      $this->System->Database->query('CREATE TABLE IF NOT EXISTS `'.$TableName.'` (
   `ID` int(11) NOT NULL AUTO_INCREMENT,
   `Entry` int(11) NOT NULL,
@@ -455 +455 @@
   ADD CONSTRAINT `'.$TableName.'_ibfk_2` FOREIGN KEY (`User`) REFERENCES `User` (`ID`),
   ADD CONSTRAINT `'.$TableName.'_ibfk_3` FOREIGN KEY (`Take`) REFERENCES `'.$TableName.'` (`ID`);');
-                $DbResult = $this->System->Database->insert('Group', array('Name' => $_POST['Name'],
-                  'TablePrefix' => $TableName, 'PrimaryKeyItem' => 'Entry'));
-                $Group = $this->System->Database->insert_id;
-                $this->System->Database->insert('GroupItem', array('Group' => $Group,
+    $DbResult = $this->System->Database->insert('Group', array('Name' => $_POST['Name'],
+      'TablePrefix' => $TableName, 'PrimaryKeyItem' => 'Entry'));
+    $Group = $this->System->Database->insert_id;
+    $this->System->Database->insert('GroupItem', array('Group' => $Group,
       'Name' => 'Jméno', 'Column' => 'Name', 'Visible' => 1));
     $Output = ShowMessage('Překladová skupina vytvořena', MESSAGE_INFORMATION);
-                  } else $Output = ShowMessage('Překladová skupina '.$TableName.' již existuje', MESSAGE_CRITICAL);
+      } else $Output = ShowMessage('Překladová skupina '.$TableName.' již existuje', MESSAGE_CRITICAL);
       $Output .= $this->ShowGroupTypeList();
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-    return($Output);
-        }
-
-        function ShowGroupDelete()
-        {
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                        $DbResult = $this->System->Database->select('Group', '*', 'Id='.$_GET['id']);
-                        if($DbResult->num_rows == 1)
-                  {
-                        $Group = $DbResult->fetch_assoc();
-                    $this->Database->query('DROP TABLE `'.$Group['TablePrefix'].'`');
-                    $this->Database->query('DELETE FROM `GroupItem` WHERE `Group`='.$Group['Id']);
-                    $this->Database->query('DELETE FROM `Group` WHERE `Id`='.$Group['Id']);
-                    $Output = ShowMessage('Překladová skupina '.$Group['Name'].' smazána', MESSAGE_INFORMATION);
-                  } else $Output = ShowMessage('Překladová skupina nenalezena', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                $Output .= $this->ShowGroupTypeList();
-                return($Output);
-        }
-
-        function Show()
-        {
-                $this->Title = T('Translation groups');
-                $Action = GetParameter('action', '');
-                if($Action == 'filter') $Output = $this->ShowMenu();
-                else if($Action == 'grouplist') $Output = $this->ShowGroupTypeList();
-                else if($Action == 'groupadd') $Output = $this->ShowGroupAdd();
-                else if($Action == 'groupdelete') $Output = $this->ShowGroupDelete();
-                else if($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
-                else
-                {
-                        $Filter = $this->ShowFilter();
-                        if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
-                        else $Output = $this->ShowGroupList($Filter);
-                }
-                return($Output);
-        }
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowGroupDelete()
+  {
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $DbResult = $this->System->Database->select('Group', '*', 'Id='.$_GET['id']);
+      if($DbResult->num_rows == 1)
+      {
+        $Group = $DbResult->fetch_assoc();
+        $this->Database->query('DROP TABLE `'.$Group['TablePrefix'].'`');
+        $this->Database->query('DELETE FROM `GroupItem` WHERE `Group`='.$Group['Id']);
+        $this->Database->query('DELETE FROM `Group` WHERE `Id`='.$Group['Id']);
+        $Output = ShowMessage('Překladová skupina '.$Group['Name'].' smazána', MESSAGE_INFORMATION);
+      } else $Output = ShowMessage('Překladová skupina nenalezena', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    $Output .= $this->ShowGroupTypeList();
+    return($Output);
+  }
+
+  function Show()
+  {
+    $this->Title = T('Translation groups');
+    $Action = GetParameter('action', '');
+    if($Action == 'filter') $Output = $this->ShowMenu();
+    else if($Action == 'grouplist') $Output = $this->ShowGroupTypeList();
+    else if($Action == 'groupadd') $Output = $this->ShowGroupAdd();
+    else if($Action == 'groupdelete') $Output = $this->ShowGroupDelete();
+    else if($Action == 'groupaddfinish') $Output = $this->ShowGroupAddFinish();
+    else
+    {
+      $Filter = $this->ShowFilter();
+      if($Filter['Group'] > 0) $Output = $this->ShowTranslationList($Filter);
+      else $Output = $this->ShowGroupList($Filter);
+    }
+    return($Output);
+  }
 }

trunk/Modules/User/Options.php

@@ -3 +3 @@
 class PageUserOptions extends Page
 {
-        function UserOptionsFrom()
-        {
-                $Output = '<form action="Options.php?action=save" method="post">
-                <fieldset><legend>Nastavení uživatele</legend>
-                <table>
-                <tr><td>Email:</td><td><input type="text" name="Email" value="'.$this->System->User->Email.'" /></td></tr>
-                <tr><td>Původní heslo:</td><td><input type="password" name="OldPass" /></td></tr>
-                <tr><td>Nové heslo:</td><td><input type="password" name="NewPass" /></td></tr>
-                <tr><td>Nové heslo pro potvrzení: </td><td><input type="password" name="NewPass2" /></td></tr>
-                <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($this->System->User->Language).'</td></tr>
-                <tr><td>Po uložení překladu přesměrovat: </td><td>';
-                $Output .= '<select name="redirecting">'.
-                                '<option value="0">Nikam</option>'.
-                                '<option value="1"';
-                if($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
-                $Output .= '>Na nepřeložené</option>';
-                $Output .= '<option value="2"';
-                if($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
-                $Output .= '>Na další překlad</option>';
-                $Output .= '<option value="3"';
-                if($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
-                $Output .= '>Na předchozí překlad</option>';
-                $Output .= '</select>';
-        
-                $Output .= '</td></tr>'.
-                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($this->System->User->PreferredVersion).'</td></tr>'.
-                                '<tr><td>Veřejný text profilu:</td><td>'.
-                                '<textarea name="info" cols="60" rows="10">'.$this->System->User->Info.'</textarea></td></tr>';
-        
-        
+  function UserOptionsFrom()
+  {
+    $Output = '<form action="Options.php?action=save" method="post">
+    <fieldset><legend>Nastavení uživatele</legend>
+    <table>
+    <tr><td>Email:</td><td><input type="text" name="Email" value="'.$this->System->User->Email.'" /></td></tr>
+    <tr><td>Původní heslo:</td><td><input type="password" name="OldPass" /></td></tr>
+    <tr><td>Nové heslo:</td><td><input type="password" name="NewPass" /></td></tr>
+    <tr><td>Nové heslo pro potvrzení: </td><td><input type="password" name="NewPass2" /></td></tr>
+    <tr><td>Normálně budu překládat do: </td><td>'.WriteLanguages($this->System->User->Language).'</td></tr>
+    <tr><td>Po uložení překladu přesměrovat: </td><td>';
+    $Output .= '<select name="redirecting">'.
+        '<option value="0">Nikam</option>'.
+        '<option value="1"';
+    if($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
+    $Output .= '>Na nepřeložené</option>';
+    $Output .= '<option value="2"';
+    if($this->System->User->Redirecting == '2') $Output .= ' selected="selected"';
+    $Output .= '>Na další překlad</option>';
+    $Output .= '<option value="3"';
+    if($this->System->User->Redirecting == '3') $Output .= ' selected="selected"';
+    $Output .= '>Na předchozí překlad</option>';
+    $Output .= '</select>';
+
+    $Output .= '</td></tr>'.
+        '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection($this->System->User->PreferredVersion).'</td></tr>'.
+        '<tr><td>Veřejný text profilu:</td><td>'.
+        '<textarea name="info" cols="60" rows="10">'.$this->System->User->Info.'</textarea></td></tr>';
+
+
     $Output .= '<tr><td>';
-                $Query = 'SELECT * FROM UserTagType';
-                $DbResult = $this->Database->query($Query);
+    $Query = 'SELECT * FROM UserTagType';
+    $DbResult = $this->Database->query($Query);
     $Output .= 'Překladatel se řídí zaškrtnutými pravidly:</td><td>';
-    while ($UserTag = $DbResult->fetch_array()) { 
-                 $Query = 'SELECT * FROM `UserTag` '.
+    while ($UserTag = $DbResult->fetch_array()) {
+     $Query = 'SELECT * FROM `UserTag` '.
      //'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
      'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-                  $DbResult2 = $this->Database->query($Query);
+      $DbResult2 = $this->Database->query($Query);
       if ($DbResult2->num_rows != 0) $checked = true;
-      else  $checked = false; 
-      
-      $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');    
+      else  $checked = false;
+
+      $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');
       $Output .= ''.$UserTag['Text'].'<br />';
     }
     $Output .= '</td></tr>';
-    
-                $Output .= '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
-                                '</table></fieldset>'.
-                                '</form>';
-        
-                $Output .= '  <fieldset><legend>Překladatelský tým</legend>';
-                $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Team`');
-                $Output .= '<a href="team/?action=create">Vytvořit tým</a><br />'.
-                                '<a href="team/?action=leave">Opustit tým</a><br />'.
-                                '<br /><form action="team/" method="get">'.
-                                '<input type="hidden" name="action" value="gointeam"/>'.
-                                '<select name="id">';
-                while($LineTeam = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<option value="'.$LineTeam['Id'].'"';
-                        if ($LineTeam['Id'] == $this->System->User->Team) $Output .= ' selected="selected"';
-                        $Output .= '>'.$LineTeam['Name'].'</option>';
-                }
-                $Output .= '</select> <input type="submit" value="Vstoupit" />
-                </form>';
-                $Output .= '</fieldset>';
-                return($Output);
-        }
-        
-        function UserOptionsSave()
-        {
-                $Output = '';
-                if(array_key_exists('Email', $_POST))
-                {
-                        $Email = $_POST['Email'];
-                        $OldPass = $_POST['OldPass'];
-                        $NewPass = $_POST['NewPass'];
-                        $NewPass2 = $_POST['NewPass2'];
-                        $Language = $_POST['Language'];
-                        $Redirecting = $_POST['redirecting'];
-                        $PreferredVersion = $_POST['ClientVersion'];
-                        if($PreferredVersion == '') $PreferredVersion = null;
-                        $Info = $_POST['info'];
-        
-                        // Do user want to change password?
-                        if(($OldPass != '') or ($NewPass != '') or ($NewPass2 != ''))
-                        {
-                                if($NewPass == $NewPass2)
-                                {
-                                        $DbResult = $this->System->Database->query('SELECT `Pass`, '.$this->System->User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$this->System->User->Id);
-                                        $DbRow = $DbResult->fetch_assoc();
-                                        if($DbRow['Hash'] == $DbRow['Pass'])
-                                        {
-                                                // Update password
-                                                $Salt = $this->System->User->GetPasswordSalt();
-                                                $this->Database->query('UPDATE `User` SET `Pass` = '.$this->System->User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$this->System->User->Id);
-                                                $Output .= ShowMessage('Heslo změněno.');
-                                        } else $Output .= ShowMessage('Staré heslo neodpovídá.', MESSAGE_CRITICAL);
-                                } else $Output .= ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
-                        }
+
+    $Output .= '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
+        '</table></fieldset>'.
+        '</form>';
+
+    $Output .= '  <fieldset><legend>Překladatelský tým</legend>';
+    $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Team`');
+    $Output .= '<a href="team/?action=create">Vytvořit tým</a><br />'.
+        '<a href="team/?action=leave">Opustit tým</a><br />'.
+        '<br /><form action="team/" method="get">'.
+        '<input type="hidden" name="action" value="gointeam"/>'.
+        '<select name="id">';
+    while($LineTeam = $DbResult->fetch_assoc())
+    {
+      $Output .= '<option value="'.$LineTeam['Id'].'"';
+      if ($LineTeam['Id'] == $this->System->User->Team) $Output .= ' selected="selected"';
+      $Output .= '>'.$LineTeam['Name'].'</option>';
+    }
+    $Output .= '</select> <input type="submit" value="Vstoupit" />
+    </form>';
+    $Output .= '</fieldset>';
+    return($Output);
+  }
+
+  function UserOptionsSave()
+  {
+    $Output = '';
+    if(array_key_exists('Email', $_POST))
+    {
+      $Email = $_POST['Email'];
+      $OldPass = $_POST['OldPass'];
+      $NewPass = $_POST['NewPass'];
+      $NewPass2 = $_POST['NewPass2'];
+      $Language = $_POST['Language'];
+      $Redirecting = $_POST['redirecting'];
+      $PreferredVersion = $_POST['ClientVersion'];
+      if($PreferredVersion == '') $PreferredVersion = null;
+      $Info = $_POST['info'];
+
+      // Do user want to change password?
+      if(($OldPass != '') or ($NewPass != '') or ($NewPass2 != ''))
+      {
+        if($NewPass == $NewPass2)
+        {
+          $DbResult = $this->System->Database->query('SELECT `Pass`, '.$this->System->User->CryptPasswordSQL('"'.$OldPass.'"', '`Salt`').' AS `Hash` FROM `User` WHERE `ID`= '.$this->System->User->Id);
+          $DbRow = $DbResult->fetch_assoc();
+          if($DbRow['Hash'] == $DbRow['Pass'])
+          {
+            // Update password
+            $Salt = $this->System->User->GetPasswordSalt();
+            $this->Database->query('UPDATE `User` SET `Pass` = '.$this->System->User->CryptPasswordSQL('"'.$NewPass.'"', '"'.$Salt.'"').', `Salt`="'.$Salt.'" WHERE `ID` = '.$this->System->User->Id);
+            $Output .= ShowMessage('Heslo změněno.');
+          } else $Output .= ShowMessage('Staré heslo neodpovídá.', MESSAGE_CRITICAL);
+        } else $Output .= ShowMessage('Hesla se neshodují.', MESSAGE_CRITICAL);
+      }
       //tag
-                $Query = 'SELECT * FROM UserTagType';
-                $DbResult = $this->Database->query($Query);
-      while ($UserTag = $DbResult->fetch_array()) { 
+      $Query = 'SELECT * FROM UserTagType';
+      $DbResult = $this->Database->query($Query);
+      while ($UserTag = $DbResult->fetch_array()) {
        if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
-                   $Query = 'SELECT * FROM `UserTag` '.
+         $Query = 'SELECT * FROM `UserTag` '.
          'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-                 $DbResult2 = $this->Database->query($Query);
+         $DbResult2 = $this->Database->query($Query);
          if ($DbResult2->num_rows == 0) {
-                   $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
+           $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
            'VALUES (NULL, '.$UserTag['ID'].' , '.($this->System->User->Id * 1).')';
-                 $DbResult2 = $this->Database->query($Query);
+           $DbResult2 = $this->Database->query($Query);
          }
        } else {
-                   $Query = 'DELETE FROM `UserTag` '.
+         $Query = 'DELETE FROM `UserTag` '.
          'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-                     $DbResult2 = $this->Database->query($Query);
+         $DbResult2 = $this->Database->query($Query);
        }
       }
-      
-                        $this->Database->update('User', '`ID` = '.$this->System->User->Id, array('Email' => $Email,
-                          'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
-                          'PreferredVersion' => $PreferredVersion));
-                        $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$this->System->User->Name.'</b>');
-                        $this->System->ModuleManager->Modules['Log']->WriteLog('Úprava nastavení!', LOG_TYPE_USER);
-                        $this->System->User->Load();
-                } else $Output .= ShowMessage('Nezadány údaje.', MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function Show()
-        {
-                $this->Title = T('User settings');
-                $Output = '';
-                if($this->System->User->Licence(LICENCE_USER))
-                {
-                        if(array_key_exists('action', $_GET) and ($_GET['action'] == 'save'))
-                        {
-                                $Output .= $this->UserOptionsSave();
-                        }
-                        $Output .= $this->UserOptionsFrom();
-                } else $Output .= ShowMessage('Nejste přihlášený.', MESSAGE_CRITICAL);
-                return($Output);
-        }       
-}    
+
+      $this->Database->update('User', '`ID` = '.$this->System->User->Id, array('Email' => $Email,
+        'Language' => $Language, 'Redirecting' => $Redirecting, 'Info' => $Info,
+        'PreferredVersion' => $PreferredVersion));
+      $Output .= ShowMessage('Úprava nastavení proběhla v pořádku, Email: <b>'.$Email.'</b> Uživatel: <b>'.$this->System->User->Name.'</b>');
+      $this->System->ModuleManager->Modules['Log']->WriteLog('Úprava nastavení!', LOG_TYPE_USER);
+      $this->System->User->Load();
+    } else $Output .= ShowMessage('Nezadány údaje.', MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function Show()
+  {
+    $this->Title = T('User settings');
+    $Output = '';
+    if($this->System->User->Licence(LICENCE_USER))
+    {
+      if(array_key_exists('action', $_GET) and ($_GET['action'] == 'save'))
+      {
+        $Output .= $this->UserOptionsSave();
+      }
+      $Output .= $this->UserOptionsFrom();
+    } else $Output .= ShowMessage('Nejste přihlášený.', MESSAGE_CRITICAL);
+    return($Output);
+  }
+}

trunk/Modules/User/Profile.php

@@ -3 +3 @@
 class PageUserProfile extends Page
 {
-        function SendMail()
-        {
-                $Output = '';
-                if(array_key_exists('text', $_POST))
-                if($this->System->User->Licence(LICENCE_ADMIN))
-                {
-                        $Text = $_POST['text'];
-                        $Email = $_POST['email'];
-                        $Subject = $_POST['subject'];
-                        $Output = 'Email: <strong>'.$Email.'</strong><br />'.
-                                        'Předmět: <strong>'.$Subject.'</strong><br />'.
-                                        'Text: <strong>'.$Text.'</strong><br />';
-
-                        if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
-                        {
-                                $Output .= ShowMessage(T('Message was sent'));
-                        }
-                        else $Output .= ShowMessage('Nepodařilo se odesat E-mail.', MESSAGE_CRITICAL);
-                } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-
-        function ExportList()
-        {
-                $Output = '';
-                $Filter = ' WHERE `Export`.`User` = '.($_GET['user'] * 1);
-                $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-
-                $Output .= '<h3>Exporty</h3>'.
-                                $PageList['Output'];
-
-                $TableColumns = array(
-                                array('Name' => 'TimeCreate', 'Title' => 'Čas vytvoření'),
-                                array('Name' => 'Title', 'Title' => 'Označení'),
-                                //  array('Name' => 'UserCount', 'Title' => 'Vybraných překladatelů'),
-                                //  array('Name' => 'GroupCount', 'Title' => 'Překladových skupin'),
-                                array('Name' => 'OutputType', 'Title' => 'Typ výstupu'),
-                                array('Name' => 'ClientVersion', 'Title' => 'Verze klienta'),
-                                array('Name' => 'UsedCount', 'Title' => 'Prohlédnutí výstupu'),
-                                array('Name' => '', 'Title' => 'Akce'),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'TimeCreate', 1);
-                $Output .= '<table class="BaseTable">'.
-                                $Order['Output'];
-
-                $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, `Export`.`ClientVersion` AS `ClientVersionId`, '.
+  function SendMail()
+  {
+    $Output = '';
+    if(array_key_exists('text', $_POST))
+    if($this->System->User->Licence(LICENCE_ADMIN))
+    {
+      $Text = $_POST['text'];
+      $Email = $_POST['email'];
+      $Subject = $_POST['subject'];
+      $Output = 'Email: <strong>'.$Email.'</strong><br />'.
+          'Předmět: <strong>'.$Subject.'</strong><br />'.
+          'Text: <strong>'.$Text.'</strong><br />';
+
+      if(@mail($Email, $Subject, $Text, 'From: '.$this->System->Config['Web']['AdminEmail'].'\nReply-To: '.$this->System->Config['Web']['AdminEmail'].'\nX-Mailer: PHP/'))
+      {
+        $Output .= ShowMessage(T('Message was sent'));
+      }
+      else $Output .= ShowMessage('Nepodařilo se odesat E-mail.', MESSAGE_CRITICAL);
+    } else $Output .= ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ExportList()
+  {
+    $Output = '';
+    $Filter = ' WHERE `Export`.`User` = '.($_GET['user'] * 1);
+    $DbResult = $this->System->Database->query('SELECT COUNT(*) FROM `Export` '.$Filter);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= '<h3>Exporty</h3>'.
+        $PageList['Output'];
+
+    $TableColumns = array(
+        array('Name' => 'TimeCreate', 'Title' => 'Čas vytvoření'),
+        array('Name' => 'Title', 'Title' => 'Označení'),
+        //  array('Name' => 'UserCount', 'Title' => 'Vybraných překladatelů'),
+        //  array('Name' => 'GroupCount', 'Title' => 'Překladových skupin'),
+        array('Name' => 'OutputType', 'Title' => 'Typ výstupu'),
+        array('Name' => 'ClientVersion', 'Title' => 'Verze klienta'),
+        array('Name' => 'UsedCount', 'Title' => 'Prohlédnutí výstupu'),
+        array('Name' => '', 'Title' => 'Akce'),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'TimeCreate', 1);
+    $Output .= '<table class="BaseTable">'.
+        $Order['Output'];
+
+    $DbResult = $this->System->Database->query('SELECT `User`.`Name` AS `UserName`, `Export`.`Id`, `Export`.`TimeCreate`, `Export`.`Title`, `Export`.`User`, `Export`.`UsedCount`, `Export`.`ClientVersion` AS `ClientVersionId`, '.
       '(SELECT Version FROM `ClientVersion` WHERE `ClientVersion`.`Id`=`Export`.`ClientVersion`) AS `ClientVersion`, '.
       '(SELECT Name FROM `ExportOutputType` WHERE `ExportOutputType`.`Id`=`Export`.`OutputType`) AS `OutputType`, '.
@@ -56 +56 @@
       '(SELECT COUNT(*) FROM `ExportUser` WHERE `ExportUser`.`Export`=`Export`.`Id`) AS `UserCount` FROM `Export` '.
       'LEFT JOIN `User` ON `User`.`ID`=`Export`.`User` '.$Filter.$Order['SQL'].$PageList['SQLLimit']);
-                while($Export = $DbResult->fetch_assoc())
-                {
-                        $Action = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0').'">Zobrazit</a> '.
-                        '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7').'">Exportovat</a>';
-                        if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
-                        if($this->System->User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a>';
-                        $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
-                                '<td>'.$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'];
-
-                $Output .= '<div style="text-align: center;"><a href="'.$this->System->Link('/export/').'">Stránka exportů</a></div>';
-                return($Output);
-        }
-
-        function ShowLastTranslated()
-  {
-        $Count = 20;
-        $Output = '<strong>Poslední překlady:</strong>';
-
-        $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
-        $Query = '';
-        $UnionItems = array();
-        $DbResult = $this->Database->query($GroupListQuery);
-        if($DbResult->num_rows > 0)
-        {
-                while($DbRow = $DbResult->fetch_assoc())
-                {
-                        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
-                          'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
-                                $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
-                                $DbRow['TablePrefix'].'` AS `T` '.
-                                'WHERE (`T`.`Complete` = 1) AND '.
-                                '(`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
-                                '(`T`.`User` = '.($_GET['user'] * 1).') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
-                                $Count.') AS `T`';
-                }
-                $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
-                                'FROM ('.implode(' UNION ', $UnionItems).') AS `TT` '.
-                                'JOIN `User` ON `User`.`Id` = `TT`.`User` '.
-                                'ORDER BY `ModifyTime` DESC LIMIT '.$Count;
-                $DbResult = $this->Database->query($Query);
-                $Output .= '<table class="BaseTable"><tr>'.
-                  '<th>Datum</th><th>Nový</th><th>Zdroj</th><th>Skupina</th></tr>';
-                while($DbRow = $DbResult->fetch_assoc())
-                {
-                        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
-                                        '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
-                                        '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
-                                        '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';
-                }
-                $Output .= '</table>';
-        }
-        return($Output);
-  }
-
-        function ShowLastForum()
+    while($Export = $DbResult->fetch_assoc())
+    {
+      $Action = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=0').'">Zobrazit</a> '.
+        '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=7').'">Exportovat</a>';
+      if($Export['User'] == $this->System->User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
+      if($this->System->User->Id != null) $Action .= ' <a href="'.$this->System->Link('/export/?Action=Clone&amp;ExportId='.$Export['Id']).'" onclick="return confirmAction(\'Opravdu klonovat položku?\');">Klonovat</a>';
+      $Output .= '<tr><td>'.HumanDate($Export['TimeCreate']).'</td>'.
+        '<td>'.$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'];
+
+    $Output .= '<div style="text-align: center;"><a href="'.$this->System->Link('/export/').'">Stránka exportů</a></div>';
+    return($Output);
+  }
+
+  function ShowLastTranslated()
+  {
+    $Count = 20;
+    $Output = '<strong>Poslední překlady:</strong>';
+
+    $GroupListQuery = 'SELECT `Group`.* FROM `Group`';
+    $Query = '';
+    $UnionItems = array();
+    $DbResult = $this->Database->query($GroupListQuery);
+    if($DbResult->num_rows > 0)
+    {
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $UnionItems[] = 'SELECT `T`.`ID`, `T`.`Take`, `T`.`User`, `T`.`ModifyTime`, `T`.`Group`, `T`.`GroupName` '.
+          'FROM (SELECT `T`.`User`, `T`.`ID`, `T`.`ModifyTime`, '.
+          $DbRow['Id'].' AS `Group`, "'.addslashes($DbRow['Name']).'" AS `GroupName`, `T`.`Take` FROM `'.
+          $DbRow['TablePrefix'].'` AS `T` '.
+          'WHERE (`T`.`Complete` = 1) AND '.
+          '(`T`.`Language` != '.$this->System->Config['OriginalLanguage'].') AND '.
+          '(`T`.`User` = '.($_GET['user'] * 1).') ORDER BY `T`.`ModifyTime` DESC LIMIT '.
+          $Count.') AS `T`';
+      }
+      $Query = 'SELECT `TT`.*, `User`.`Name` AS `UserName`, `User`.`Id` AS `UserId` '.
+          'FROM ('.implode(' UNION ', $UnionItems).') AS `TT` '.
+          'JOIN `User` ON `User`.`Id` = `TT`.`User` '.
+          'ORDER BY `ModifyTime` DESC LIMIT '.$Count;
+      $DbResult = $this->Database->query($Query);
+      $Output .= '<table class="BaseTable"><tr>'.
+        '<th>Datum</th><th>Nový</th><th>Zdroj</th><th>Skupina</th></tr>';
+      while($DbRow = $DbResult->fetch_assoc())
+      {
+        $Output .= '<tr><td>'.HumanDate($DbRow['ModifyTime']).'</td>'.
+            '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['ID'].'">'.$DbRow['ID'].'</a></td>'.
+            '<td><a href="form.php?group='.$DbRow['Group'].'&amp;ID='.$DbRow['Take'].'">'.$DbRow['Take'].'</a></td>'.
+            '<td><a href="TranslationList.php?group='.$DbRow['Group'].'&amp;action=filter">'.$DbRow['GroupName'].'</a></td></tr>';
+      }
+      $Output .= '</table>';
+    }
+    return($Output);
+  }
+
+  function ShowLastForum()
   {
     $parser = new HTML_BBCodeParser2(array('filters' => array('Basic','Extended','Images','Links','Lists','Email')));
-        $Count = 20;
-        $Output = '<strong>Poslední příspěvky ve fóru:</strong>';
-
-                $Output .= '<div class="shoutbox">';
-                $DbResult = $this->System->Database->query('SELECT `ForumText`.`Text`, `ForumText`.`Date`, `ForumText`.`UserName`,`ForumThread`.`Text` as `ThreadName`,`ForumText`.`Thread` FROM `ForumText` JOIN `ForumThread` ON `ForumThread`.`ID` = `ForumText`.`Thread` WHERE `ForumText`.`User` = '.($_GET['user'] * 1).' ORDER BY `ForumText`.`Date` DESC LIMIT '.$Count);
-                while($Line = $DbResult->fetch_assoc())
-                        $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.$Line['ThreadName'].'</a><br /><strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse($Line['Text']).'</div> ';
-                $Output .= '</div>';
-                return($Output);
-  }
-
-        function ShowProfile()
-        {
-                $Output = '';
-                $Query = 'SELECT `User`.`Name`, `UserTrace`.`LastLogin`, `UserTrace`.`LastIP`, '.
-                                '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '.
-                                '`User`.`TranslatedCount`, `User`.`Team`, `User`.`ID`, `User`.`Info`, '.
-                                '`Team`.`Name` AS `TeamName`, `Language`.`Name` AS `LanguageName`, '.
-                                '`ClientVersion`.`Version` AS `Version` FROM `User` '.
-                                'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-                                'LEFT JOIN `Language` ON `Language`.`Id` = `User`.`Language` '.
-                                'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
-                                'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
-                                'WHERE `User`.`Id` = '.($_GET['user'] * 1);
-                $DbResult = $this->Database->query($Query);
-                if($DbResult->num_rows > 0)
-                {
-                $UserLine = $DbResult->fetch_array();
-
-                $Output .=
-                '<h3>Překladatel '.$UserLine['Name'].'</h3>'.
-                'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'.
-                'Výchozí verze klienta: <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$UserLine['PreferredVersion']).'"><strong>'.$UserLine['Version'].'</strong></a><br />'.
-                'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
-                'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />';
-                if($UserLine['TeamName'] != '')
-                        $Output .= 'Člen týmu: <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
-                //user tags
-                $Query = 'SELECT * FROM `UserTag` '.
+    $Count = 20;
+    $Output = '<strong>Poslední příspěvky ve fóru:</strong>';
+
+    $Output .= '<div class="shoutbox">';
+    $DbResult = $this->System->Database->query('SELECT `ForumText`.`Text`, `ForumText`.`Date`, `ForumText`.`UserName`,`ForumThread`.`Text` as `ThreadName`,`ForumText`.`Thread` FROM `ForumText` JOIN `ForumThread` ON `ForumThread`.`ID` = `ForumText`.`Thread` WHERE `ForumText`.`User` = '.($_GET['user'] * 1).' ORDER BY `ForumText`.`Date` DESC LIMIT '.$Count);
+    while($Line = $DbResult->fetch_assoc())
+      $Output .= '<div><a href="'.$this->System->Link('/forum/?Thread='.$Line['Thread']).'">'.$Line['ThreadName'].'</a><br /><strong>'.$Line['UserName'].'</strong> ('.HumanDate($Line['Date']).'): '.$parser->qparse($Line['Text']).'</div> ';
+    $Output .= '</div>';
+    return($Output);
+  }
+
+  function ShowProfile()
+  {
+    $Output = '';
+    $Query = 'SELECT `User`.`Name`, `UserTrace`.`LastLogin`, `UserTrace`.`LastIP`, '.
+        '`User`.`Email`, `UserTrace`.`UserAgent`, `User`.`PreferredVersion`, '.
+        '`User`.`TranslatedCount`, `User`.`Team`, `User`.`ID`, `User`.`Info`, '.
+        '`Team`.`Name` AS `TeamName`, `Language`.`Name` AS `LanguageName`, '.
+        '`ClientVersion`.`Version` AS `Version` FROM `User` '.
+        'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
+        'LEFT JOIN `Language` ON `Language`.`Id` = `User`.`Language` '.
+        'LEFT JOIN `Team` ON `Team`.`Id` = `User`.`Team` '.
+        'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
+        'WHERE `User`.`Id` = '.($_GET['user'] * 1);
+    $DbResult = $this->Database->query($Query);
+    if($DbResult->num_rows > 0)
+    {
+    $UserLine = $DbResult->fetch_array();
+
+    $Output .=
+    '<h3>Překladatel '.$UserLine['Name'].'</h3>'.
+    'Výchozí jazyk: <strong>'.$UserLine['LanguageName'].'</strong><br />'.
+    'Výchozí verze klienta: <a href="'.$this->System->Link('/client-version/?action=item&amp;id='.$UserLine['PreferredVersion']).'"><strong>'.$UserLine['Version'].'</strong></a><br />'.
+    'Poslední připojení: <strong>'.HumanDateTime($UserLine['LastLogin']).'</strong><br />'.
+    'Počet přeložených: <a href="TranslationList.php?user='.$UserLine['ID'].'&amp;state=2&amp;group=0" title="Zobrazit Všechny jeho přeložené texty"><strong>'.$UserLine['TranslatedCount'].'</strong></a><br />';
+    if($UserLine['TeamName'] != '')
+      $Output .= 'Člen týmu: <a href="team/?action=team&amp;id='.$UserLine['Team'].'"><strong>'.$UserLine['TeamName'].'</strong></a><br />';
+    //user tags
+    $Query = 'SELECT * FROM `UserTag` '.
      'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
      'WHERE `User` = '.($_GET['user'] * 1);
-                $DbResult = $this->Database->query($Query);
+    $DbResult = $this->Database->query($Query);
     if ($DbResult->num_rows != 0) {
       $Output .= 'Překladatel se řídí těmito pravidly:<br />';
@@ -174 +174 @@
     $Output .= '<br /><fieldset><legend>Text profilu:</legend>'.str_replace("\n", '<br/>', $UserLine['Info']).'</fieldset><br/>';
 
-        $Output .= '<table class="Home"><tr>'.
-                        '<td>'.$this->ShowLastTranslated().'</td>'.
-                        '<td>'.$this->ExportList().'</td>'.
-                        '</tr></table>';
-                $Output .= '<br />'.$this->ShowLastForum().'<br />';
-                if($this->System->User->Licence(LICENCE_MODERATOR))
-         {
-                        $Output .= '<fieldset><legend>Moderování</legend>';
+    $Output .= '<table class="Home"><tr>'.
+        '<td>'.$this->ShowLastTranslated().'</td>'.
+        '<td>'.$this->ExportList().'</td>'.
+        '</tr></table>';
+    $Output .= '<br />'.$this->ShowLastForum().'<br />';
+    if($this->System->User->Licence(LICENCE_MODERATOR))
+   {
+      $Output .= '<fieldset><legend>Moderování</legend>';
 
       $Output .= '<form action="?user='.($_GET['user'] * 1).'" method="post">Přidání tagu uživateli:<br />';
-                  $Query = 'SELECT * FROM UserTagType';
-                  $DbResult = $this->Database->query($Query);
+      $Query = 'SELECT * FROM UserTagType';
+      $DbResult = $this->Database->query($Query);
       while ($UserTag = $DbResult->fetch_array()) {
         //save:
        if (array_key_exists('save', $_POST)) {
         if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
-                    $Query = 'SELECT * FROM `UserTag` '.
+          $Query = 'SELECT * FROM `UserTag` '.
           'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($_GET['user']*1);
-                  $DbResult2 = $this->Database->query($Query);
+          $DbResult2 = $this->Database->query($Query);
           if ($DbResult2->num_rows == 0) {
-                    $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
+            $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
             'VALUES (NULL, '.$UserTag['ID'].' , '.($_GET['user']*1).')';
-                $DbResult2 = $this->Database->query($Query);
+            $DbResult2 = $this->Database->query($Query);
           }
         } else {
-                   $Query = 'DELETE FROM `UserTag` '.
+           $Query = 'DELETE FROM `UserTag` '.
            'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($_GET['user'] * 1);
-                       $DbResult2 = $this->Database->query($Query);
+           $DbResult2 = $this->Database->query($Query);
         }
        }
 
-                    $Query = 'SELECT * FROM `UserTag` '.
+        $Query = 'SELECT * FROM `UserTag` '.
         'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($_GET['user'] * 1);
-                    $DbResult2 = $this->Database->query($Query);
+        $DbResult2 = $this->Database->query($Query);
         if ($DbResult2->num_rows != 0) $checked = true;
         else  $checked = false;
@@ -216 +216 @@
       $Output .= '<input name="save" type="submit" value="Uložit" /></form>';
 
-                        $Output .= ' PosledníIP: <strong>'.$UserLine['LastIP'].'</strong><br />'.
-                                        'Prohlížeč: <strong>'.$UserLine['UserAgent'].'</strong><br />'.
-                                        'Email: <strong>'.$UserLine['Email'].'</strong><br />';
-                        $Output .= '<br/><form action="user.php" method="post"><div>'.
-                                        'Napsat E-mail:'.
-                                        '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.
-                                        'Předmět:'.
-                                        '<input type="text" name="subject" value="'.$this->System->Config['Web']['Title'].'" />'.
-                                        '<br />'.
-                                        '<textarea name="text" rows="20" cols="62">'.
-                                        ''."\n".
-                                        'S pozdravem '.$this->System->User->Name."\n".
-                                        '--------------------------------------------------------'."\n".
-                                        $this->System->Config['Web']['Title'].' '.$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
-                                        '</textarea><br/>'.
-                                        '<input type="submit" value="Odeslat" />'.
-                                        '</div></form></fieldset>';
-                }
-                } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
-                return($Output);
-        }
-
-        function Show()
-        {
-                $this->Title = T('User profile');
-                $Output = $this->SendMail();
-                if(array_key_exists('user', $_GET))
-                {
-                        $Output .= $this->ShowProfile();
-                } else $Output .= ShowMessage('Nevybrán uživatel', MESSAGE_CRITICAL);
-                return($Output);
-        }
+      $Output .= ' PosledníIP: <strong>'.$UserLine['LastIP'].'</strong><br />'.
+          'Prohlížeč: <strong>'.$UserLine['UserAgent'].'</strong><br />'.
+          'Email: <strong>'.$UserLine['Email'].'</strong><br />';
+      $Output .= '<br/><form action="user.php" method="post"><div>'.
+          'Napsat E-mail:'.
+          '<input type="text" name="email" value="'.$UserLine['Email'].'" /><br/>'.
+          'Předmět:'.
+          '<input type="text" name="subject" value="'.$this->System->Config['Web']['Title'].'" />'.
+          '<br />'.
+          '<textarea name="text" rows="20" cols="62">'.
+          ''."\n".
+          'S pozdravem '.$this->System->User->Name."\n".
+          '--------------------------------------------------------'."\n".
+          $this->System->Config['Web']['Title'].' '.$this->System->Config['Web']['Host'].$this->System->Link('/')."\n".
+          '</textarea><br/>'.
+          '<input type="submit" value="Odeslat" />'.
+          '</div></form></fieldset>';
+    }
+    } else $Output .= ShowMessage('Uživatel nenalezen', MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function Show()
+  {
+    $this->Title = T('User profile');
+    $Output = $this->SendMail();
+    if(array_key_exists('user', $_GET))
+    {
+      $Output .= $this->ShowProfile();
+    } else $Output .= ShowMessage('Nevybrán uživatel', MESSAGE_CRITICAL);
+    return($Output);
+  }
 }

trunk/Modules/User/Registration.php

@@ -3 +3 @@
 class PageUserRegistration extends Page
 {
-        function ShowForm()
-        {
-                if(array_key_exists('sc', $_POST)) $Human = true;
+  function ShowForm()
+  {
+    if(array_key_exists('sc', $_POST)) $Human = true;
       else $Human = false;
-                if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
-                else $UserName = '';
-                if(array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
-                else $Email = '';
-                if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'];
-                else $Team = '';
-                if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
-                else $Language = 1;
+    if(array_key_exists('user', $_POST)) $UserName = $_POST['user'];
+    else $UserName = '';
+    if(array_key_exists('Email', $_POST)) $Email = $_POST['Email'];
+    else $Email = '';
+    if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'];
+    else $Team = '';
+    if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
+    else $Language = 1;
 
-                $Output = '<form action="?" method="post">
-                <fieldset><legend>'.T('New user registration').'</legend>
-                <table>
-                <tr><td colspan="2">Pozorně si přečtěte <a href="info.php">pokyny k překladu</a> a řiďte se jimi. Překládat je nutno včetně háčků a čárek!<br/><br/></td></tr>
-                <tr>
-                <td>Jsi člověk? </td>';
-                if($Human) $Checked = ' checked="checked"';
-                else $Checked = '';
-                $Output .= '<td><input type="checkbox" name="sc" '.$Checked.'/></td>
-                </tr>
-                <tr>
-                <td>Jméno:</td>
-                <td><input type="text" name="user" value="'.$UserName.'"/></td>
-                </tr>
-                <tr>
-                <td>Heslo:</td>
-                <td><input type="password" name="pass" /></td>
-                </tr>
-                <tr>
-                <td>Potvrzení Hesla: </td>
-                <td><input type="password" name="pass2" /></td>
-                </tr>
-                <tr>
-                <td>Email: </td>
-                <td><input type="text" name="Email" value="'.$Email.'"/></td>
-                </tr>
-                <tr>
-                <td>Normálně budu překládat do: </td>
-                <td>'.WriteLanguages($Language).'</td>
-                </tr>
-                <tr>
-                <td>Patřím do týmu: </td>';
-                if($Team == '') $Selected = ' selected="selected"';
-                else $Selected = '';
-                $Output .= '<td><select name="Team"><option value="0"'.$Selected.'>Žádného</option>
-                ';
-                $DbResult = $this->Database->query('SELECT `Name`, `Id` FROM `Team`');
-                while($Line = $DbResult->fetch_assoc())
-                {
-                        if($Team == $Line['Id']) $Selected = ' selected="selected"';
-                        else $Selected = '';
-                        $Output .= '<option value="0'.$Line['Id'].'"'.$Selected.'>'.$Line['Name'].'</option>';
-                }
-                $Output .= '</select></td>
-                </tr>';
-                $Output .= '</td></tr>'.
-                                '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection('').'</td></tr>';
+    $Output = '<form action="?" method="post">
+    <fieldset><legend>'.T('New user registration').'</legend>
+    <table>
+    <tr><td colspan="2">Pozorně si přečtěte <a href="info.php">pokyny k překladu</a> a řiďte se jimi. Překládat je nutno včetně háčků a čárek!<br/><br/></td></tr>
+    <tr>
+    <td>Jsi člověk? </td>';
+    if($Human) $Checked = ' checked="checked"';
+    else $Checked = '';
+    $Output .= '<td><input type="checkbox" name="sc" '.$Checked.'/></td>
+    </tr>
+    <tr>
+    <td>Jméno:</td>
+    <td><input type="text" name="user" value="'.$UserName.'"/></td>
+    </tr>
+    <tr>
+    <td>Heslo:</td>
+    <td><input type="password" name="pass" /></td>
+    </tr>
+    <tr>
+    <td>Potvrzení Hesla: </td>
+    <td><input type="password" name="pass2" /></td>
+    </tr>
+    <tr>
+    <td>Email: </td>
+    <td><input type="text" name="Email" value="'.$Email.'"/></td>
+    </tr>
+    <tr>
+    <td>Normálně budu překládat do: </td>
+    <td>'.WriteLanguages($Language).'</td>
+    </tr>
+    <tr>
+    <td>Patřím do týmu: </td>';
+    if($Team == '') $Selected = ' selected="selected"';
+    else $Selected = '';
+    $Output .= '<td><select name="Team"><option value="0"'.$Selected.'>Žádného</option>
+    ';
+    $DbResult = $this->Database->query('SELECT `Name`, `Id` FROM `Team`');
+    while($Line = $DbResult->fetch_assoc())
+    {
+      if($Team == $Line['Id']) $Selected = ' selected="selected"';
+      else $Selected = '';
+      $Output .= '<option value="0'.$Line['Id'].'"'.$Selected.'>'.$Line['Name'].'</option>';
+    }
+    $Output .= '</select></td>
+    </tr>';
+    $Output .= '</td></tr>'.
+        '<tr><td>Upřednostněná verze klienta: </td><td>'.ClientVersionSelection('').'</td></tr>';
 
         $Output .= '<tr><td>';
-                $Query = 'SELECT * FROM UserTagType';
-                $DbResult = $this->Database->query($Query);
+    $Query = 'SELECT * FROM UserTagType';
+    $DbResult = $this->Database->query($Query);
     $Output .= 'Vyberte pravidla, kterými se při překladu chcete řídit:</td><td>';
     while ($UserTag = $DbResult->fetch_array()) {
-                  $checked = false;
+      $checked = false;
 
       $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');
@@ -77 +77 @@
 
     $Output .= '<tr>
-                <th><input type="submit" value="Registrovat" /></th>
-                </tr>
-                </table></fieldset></form>';
-                return($Output);
-        }
+    <th><input type="submit" value="Registrovat" /></th>
+    </tr>
+    </table></fieldset></form>';
+    return($Output);
+  }
 
   function CheckRegistration()
@@ -157 +157 @@
   }
 
-        function Show()
-        {
-          $this->Title = T('User registration');
-                $Output = '';
-                if(array_key_exists('user', $_POST))
-                {
+  function Show()
+  {
+    $this->Title = T('User registration');
+    $Output = '';
+    if(array_key_exists('user', $_POST))
+    {
       $Output .= $this->CheckRegistration();
-                } else $Output .= $this->ShowForm();
-                return($Output);
-        }
+    } else $Output .= $this->ShowForm();
+    return($Output);
+  }
 }

trunk/Modules/User/User.php

@@ -8 +8 @@
 class ModuleUser extends AppModule
 {
-        function __construct($System)
-        {
-                parent::__construct($System);
-                $this->Name = 'User';
-                $this->Version = '1.1';
-                $this->Creator = 'Chronos';
-                $this->License = 'GNU/GPL';
-                $this->Description = 'User and permission management';
-                $this->Dependencies = array();
-        }
-
-        function Start()
-        {
-                $this->System->User = new User($this->System);
+  function __construct($System)
+  {
+    parent::__construct($System);
+    $this->Name = 'User';
+    $this->Version = '1.1';
+    $this->Creator = 'Chronos';
+    $this->License = 'GNU/GPL';
+    $this->Description = 'User and permission management';
+    $this->Dependencies = array();
+  }
+
+  function Start()
+  {
+    $this->System->User = new User($this->System);
     $this->System->RegisterPage('userlist.php', 'PageUserList');
-                $this->System->RegisterPage('Options.php', 'PageUserOptions');
-                $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
-                $this->System->RegisterPage('user.php', 'PageUserProfile');
-                $this->System->RegisterPage('login', 'PageUserLogin');
-                $this->System->RegisterMenuItem(array(
-        'Title' => T('Translators'),
-        'Hint' => 'Seznam registrovaných uživatelů',
-        'Link' => $this->System->Link('/userlist.php'),
-        'Permission' => LICENCE_ANONYMOUS,
-        'Icon' => '',
+    $this->System->RegisterPage('Options.php', 'PageUserOptions');
+    $this->System->RegisterPage('registrace.php', 'PageUserRegistration');
+    $this->System->RegisterPage('user.php', 'PageUserProfile');
+    $this->System->RegisterPage('login', 'PageUserLogin');
+    $this->System->RegisterMenuItem(array(
+      'Title' => T('Translators'),
+      'Hint' => 'Seznam registrovaných uživatelů',
+      'Link' => $this->System->Link('/userlist.php'),
+      'Permission' => LICENCE_ANONYMOUS,
+      'Icon' => '',
     ), 0);
     if(array_key_exists('Search', $this->System->ModuleManager->Modules))
       $this->System->ModuleManager->Modules['Search']->RegisterSearch('user',
       T('Translators'), array('Name'), '`User`', $this->System->Link('/userlist.php?search='));
-        }
-
-        function ShowOnlineList()
-        {
-                $Output = T('Online translators').':<br />';
-                $DbResult = $this->System->Database->query('SELECT * FROM ('.
+  }
+
+  function ShowOnlineList()
+  {
+    $Output = T('Online translators').':<br />';
+    $DbResult = $this->System->Database->query('SELECT * FROM ('.
 'SELECT `User`.`Name`, `User`.`ID` FROM `UserOnline` '.
-                                'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
-                                'WHERE (`ActivityTime` >= NOW() - 300) '.
-                                'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
-                while($DbUser = $DbResult->fetch_assoc())
-                {
-                        $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
-                        $Output .= $Name.'<br />';
-                }
-                return($Output);
-        }
+        'JOIN `User` ON `User`.`ID` = `UserOnline`.`User` '.
+        'WHERE (`ActivityTime` >= NOW() - 300) '.
+        'ORDER BY `ActivityTime` DESC ) AS `T` GROUP BY `Name`');
+    while($DbUser = $DbResult->fetch_assoc())
+    {
+      $Name = '<a href="'.$this->System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
+      $Output .= $Name.'<br />';
+    }
+    return($Output);
+  }
 }
 
 class PageUserLogin extends Page
 {
-        function Show()
-        {
-                $Output = '<form action="'.$this->System->Link('/?action=login').'" method="post">'.
-                        '<fieldset><legend>'.T('Login').'</legend>
-                        <table>
-                        <tr>
-                        <td>'.T('Name').':</td><td><input type="text" name="LoginUser" size="13" /></td>
-                        </tr>
-                        <tr>
-                        <td>'.T('Password').':</td><td><input type="password" name="LoginPass" size="13" /></td>
-                        </tr>
-                        <tr>
-                        <td>'.T('Stay logged').':</td><td><input type="checkbox" name="StayLogged" /></td>
-                        </tr>
-                        <tr>
-                        <th><input type="submit" value="'.T('Do login').'" /></th>
-                        </tr>
-                        </table>
-                        </fieldset></form>';
-                        return($Output);
-        }
+  function Show()
+  {
+    $Output = '<form action="'.$this->System->Link('/?action=login').'" method="post">'.
+      '<fieldset><legend>'.T('Login').'</legend>
+      <table>
+      <tr>
+      <td>'.T('Name').':</td><td><input type="text" name="LoginUser" size="13" /></td>
+      </tr>
+      <tr>
+      <td>'.T('Password').':</td><td><input type="password" name="LoginPass" size="13" /></td>
+      </tr>
+      <tr>
+      <td>'.T('Stay logged').':</td><td><input type="checkbox" name="StayLogged" /></td>
+      </tr>
+      <tr>
+      <th><input type="submit" value="'.T('Do login').'" /></th>
+      </tr>
+      </table>
+      </fieldset></form>';
+      return($Output);
+  }
 }
 
@@ -114 +114 @@
   function Login($Name, $Password, $StayLogged = false)
   {
-        $SID = session_id();
+    $SID = session_id();
     $DbResult = $this->Database->query('SELECT `ID` FROM `User` WHERE '.
       'LOWER(`Name`) = LOWER("'.$Name.'") AND `Pass` = '.$this->CryptPasswordSQL('"'.$Password.'"', '`Salt`'));
@@ -147 +147 @@
   function Logout()
   {
-        $SID = session_id();
+    $SID = session_id();
     if($this->Role != LICENCE_ANONYMOUS)
     {
@@ -162 +162 @@
     $DbResult = $this->Database->query('SELECT `User`.`PreferredVersion`,`User`.`ID`,`User`.`Team`,`User`.`Redirecting`,`User`.`Email`,`User`.`Info`,'.
     '`User`.`Language`,`User`.`Name`,`User`.`GM`,`ClientVersion`.`Version` AS `PreferredVersionGame` FROM `User` '.
-                'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
+    'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
     'WHERE `User`.`ID` = '.$this->Id);
     if($DbResult->num_rows > 0)
@@ -230 +230 @@
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('ActivityTime' => 'NOW()'));
     } else {
-        if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
-          else $HostName = '';
-        $this->Database->insert('UserOnline', array('SessionId' => $SID,
+      if(GetRemoteAddress() != '') $HostName = gethostbyaddr(GetRemoteAddress());
+        else $HostName = '';
+      $this->Database->insert('UserOnline', array('SessionId' => $SID,
       'User' => null, 'LoginTime' => 'NOW()', 'ActivityTime' => 'NOW()',
       'IpAddress' => GetRemoteAddress(), 'HostName' => $HostName,
       'ScriptName' => GetRequestURI()));
     }
-        
+
     // Logged permanently?
-          if(array_key_exists('LoginHash', $_COOKIE))
-          {
-            $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
-              ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
-            if($DbResult->num_rows > 0)
-            {
-              $DbRow = $DbResult->fetch_assoc();
-              if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
-              {
-                $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
-                $this->Database->query('UPDATE `UserOnline` SET `SessionId`="'.$SID.'" WHERE `Id`='.$DbRow['Id']);
-              }
-            }
-    }
-
-          // Check login
+    if(array_key_exists('LoginHash', $_COOKIE))
+    {
+      $DbResult = $this->Database->query('SELECT * FROM `UserOnline` WHERE `User`='.$_COOKIE['LoginUserId'].
+        ' AND `StayLogged`=1 AND SessionId!="'.$SID.'"');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_assoc();
+        if(sha1($_COOKIE['LoginUserId'].$DbRow['StayLoggedHash']) == $_COOKIE['LoginHash'])
+        {
+          $this->Database->query('DELETE FROM `UserOnline` WHERE `SessionId`="'.$SID.'"');
+          $this->Database->query('UPDATE `UserOnline` SET `SessionId`="'.$SID.'" WHERE `Id`='.$DbRow['Id']);
+        }
+      }
+    }
+
+    // Check login
     $Query = $this->Database->select('UserOnline', '*', '`SessionId`="'.$SID.'"');
     $Row = $Query->fetch_assoc();
     if($Row['User'] != '')
     {
-        $this->Id = $Row['User'];
+      $this->Id = $Row['User'];
       $this->Load();
     } else

trunk/Modules/User/UserList.php

@@ -5 +5 @@
 class PageUserList extends Page
 {
-        function Show()
-        {
-                $this->Title = T('Translators');
-                ImgLevelUpdate();
-        
-                $Output = '';
-                if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
-                else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
-                if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
-                if($_SESSION['search'] != '')
-                {
-                        $SearchQuery = ' AND (`User`.`Name` LIKE "%'.$_SESSION['search'].'%")';
-                        $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
-                } else $SearchQuery = '';                       
+  function Show()
+  {
+    $this->Title = T('Translators');
+    ImgLevelUpdate();
+
+    $Output = '';
+    if(array_key_exists('search', $_GET)) $_SESSION['search'] = $_GET['search'];
+    else if(!array_key_exists('search', $_SESSION)) $_SESSION['search'] = '';
+    if(array_key_exists('search', $_GET) and ($_GET['search'] == '')) $_SESSION['search'] = '';
+    if($_SESSION['search'] != '')
+    {
+      $SearchQuery = ' AND (`User`.`Name` LIKE "%'.$_SESSION['search'].'%")';
+      $Output .= '<div><a href="?search=">'.sprintf(T('Disable filter "%s"'), $_SESSION['search']).'</a></div>';
+    } else $SearchQuery = '';
 
     $TeamFilter = '';
-                if(array_key_exists('team', $_GET))
-                {
-                        $TeamId = $_GET['team'] * 1;
-                        $DbResult = $this->Database->select('Team', 'Name', 'Id='.$TeamId);
-                        if($DbResult->num_rows > 0)
-                        {
-                                $Team = $DbResult->fetch_assoc();
-                                $Output .= '<h3>'.sprintf(T('Users in team %s'), $Team['Name']).'</h3>';
-                                $TeamFilter = ' AND (`Team`='.$_GET['team'].')';
-                        } else {
-                  $Output .= ShowMessage(sprintf(T('Team %d not found'), $TeamId), MESSAGE_CRITICAL);
-                        }
-                } else
-                {
-                        $Output .= '<h3>'.T('User list').'</h3>';
-                }
-        
-                $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User` WHERE 1'.$SearchQuery.$TeamFilter);
-                $DbRow = $DbResult->fetch_row();
-                $PageList = GetPageList($DbRow[0]);
-        
-                $Output .= $PageList['Output'].
-                '<table class="BaseTable">';
-        
-                $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' => 'GM', 'Title' => T('GM')),
-                        array('Name' => 'LastLogin', 'Title' => T('Last logged in')),
-                        array('Name' => 'RegistrationTime', 'Title' => T('Registration time')),
-                );
-                $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
-                $Output .= $Order['Output'];    
-        
-                $Query = 'SELECT `User`.`ID`, `User`.`Name`, `LastLogin`, `GM`, `XP`, `TranslatedCount`, `RegistrationTime` '.
-                                'FROM `User` '.
-                                'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
-                                'WHERE 1'.$SearchQuery.$TeamFilter.$Order['SQL'].$PageList['SQLLimit'];
-        
-                $DbResult = $this->Database->query($Query);
-                while($Line = $DbResult->fetch_assoc())
-                {
-                        $XP = GetLevelMinMax($Line['XP']);
-                        $Output .= '<tr><td><a href="user.php?user='.$Line['ID'].'">'.$Line['Name'].'</a></td>'.
-                                        '<td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
-                                        '<td>'.$XP['Level'].'</td>'.
-                                        '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
-                                        //<td>'.$Moderators[$Line['GM']].'</td>
-                        '<td>'.HumanDate($Line['LastLogin']).'</td>'.
-                        '<td>'.HumanDate($Line['RegistrationTime']).'</td></tr>';
-                }
-                $Output .= '</table>'.
-                                $PageList['Output'];
-        
-                return($Output);
-        }       
+    if(array_key_exists('team', $_GET))
+    {
+      $TeamId = $_GET['team'] * 1;
+      $DbResult = $this->Database->select('Team', 'Name', 'Id='.$TeamId);
+      if($DbResult->num_rows > 0)
+      {
+        $Team = $DbResult->fetch_assoc();
+        $Output .= '<h3>'.sprintf(T('Users in team %s'), $Team['Name']).'</h3>';
+        $TeamFilter = ' AND (`Team`='.$_GET['team'].')';
+      } else {
+        $Output .= ShowMessage(sprintf(T('Team %d not found'), $TeamId), MESSAGE_CRITICAL);
+      }
+    } else
+    {
+      $Output .= '<h3>'.T('User list').'</h3>';
+    }
+
+    $DbResult = $this->Database->query('SELECT COUNT(*) FROM `User` WHERE 1'.$SearchQuery.$TeamFilter);
+    $DbRow = $DbResult->fetch_row();
+    $PageList = GetPageList($DbRow[0]);
+
+    $Output .= $PageList['Output'].
+    '<table class="BaseTable">';
+
+    $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' => 'GM', 'Title' => T('GM')),
+      array('Name' => 'LastLogin', 'Title' => T('Last logged in')),
+      array('Name' => 'RegistrationTime', 'Title' => T('Registration time')),
+    );
+    $Order = GetOrderTableHeader($TableColumns, 'TranslatedCount', 1);
+    $Output .= $Order['Output'];
+
+    $Query = 'SELECT `User`.`ID`, `User`.`Name`, `LastLogin`, `GM`, `XP`, `TranslatedCount`, `RegistrationTime` '.
+        'FROM `User` '.
+        'LEFT JOIN `UserTrace` ON `UserTrace`.`User` = `User`.`Id` '.
+        'WHERE 1'.$SearchQuery.$TeamFilter.$Order['SQL'].$PageList['SQLLimit'];
+
+    $DbResult = $this->Database->query($Query);
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $XP = GetLevelMinMax($Line['XP']);
+      $Output .= '<tr><td><a href="user.php?user='.$Line['ID'].'">'.$Line['Name'].'</a></td>'.
+          '<td style="text-align: center;"><a href="TranslationList.php?user='.$Line['ID'].'&amp;group=0&amp;state=2" title="Zobrazit Všechny jeho přeložené texty">'.$Line['TranslatedCount'].'</a></td>'.
+          '<td>'.$XP['Level'].'</td>'.
+          '<td>'.ProgressBar(150, round($XP['XP'] / $XP['MaxXP'] * 100, 2), $XP['XP'].' / '.$XP['MaxXP']).'</td>'.
+          //<td>'.$Moderators[$Line['GM']].'</td>
+      '<td>'.HumanDate($Line['LastLogin']).'</td>'.
+      '<td>'.HumanDate($Line['RegistrationTime']).'</td></tr>';
+    }
+    $Output .= '</table>'.
+        $PageList['Output'];
+
+    return($Output);
+  }
 }

trunk/Modules/Wiki/Wiki.php

@@ -13 +13 @@
     $this->Dependencies = array();
   }
-  
+
   function Install()
   {
@@ -22 +22 @@
   {
     parent::UnInstall();
-  }  
-  
+  }
+
   function Start()
   {
@@ -29 +29 @@
     $this->LoadPages();
   }
-  
+
   function Stop()
   {
-        parent::Stop();
-  }
-  
+    parent::Stop();
+  }
+
   function LoadPages()
   {
-        $DbResult = $this->Database->select('WikiPage', '*', 'VisibleInMenu=1');
-        while($DbRow = $DbResult->fetch_assoc())
-        {
-                $this->System->RegisterPage($DbRow['NormalizedName'], 'PageWiki');
-                $this->System->RegisterMenuItem(array(
-                                'Title' => $DbRow['Name'],
-                                'Hint' => '',
-                                'Link' => $this->System->Link('/'.$DbRow['NormalizedName'].'/'),
-                                'Permission' => LICENCE_ANONYMOUS,
-                                'Icon' => '',
-                ), 6);
-        }
+    $DbResult = $this->Database->select('WikiPage', '*', 'VisibleInMenu=1');
+    while($DbRow = $DbResult->fetch_assoc())
+    {
+      $this->System->RegisterPage($DbRow['NormalizedName'], 'PageWiki');
+      $this->System->RegisterMenuItem(array(
+          'Title' => $DbRow['Name'],
+          'Hint' => '',
+          'Link' => $this->System->Link('/'.$DbRow['NormalizedName'].'/'),
+          'Permission' => LICENCE_ANONYMOUS,
+          'Icon' => '',
+      ), 6);
+    }
   }
 }
@@ -54 +54 @@
 class PageWiki extends Page
 {
-        function Show()
-        {
-                if(array_key_exists('Action', $_GET))
-                {
-                        if($_GET['Action'] == 'Edit') $Output = $this->EditContent();
-                        else if($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
-                        else if($_GET['Action'] == 'History') $Output = $this->ShowHistory();
-                        else $Output = $this->ShowContent();
-                } else $Output = $this->ShowContent();
-                return($Output);
-        }
-        
-        function ShowContent()
-        {
-                $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
-                $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-                if($DbResult->num_rows > 0)
-                {
-                        $DbRow = $DbResult->fetch_assoc();
-                        if(array_key_exists('ver', $_GET))
-                        {
-                                $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' AND Id='.$_GET['ver']*1);
-                          if($DbResult2->num_rows > 0)
-                          {
-                                  $DbRow2 = $DbResult2->fetch_assoc();
-                                $Output = '<h3>Archív stránky '.$DbRow['Name'].' ('.HumanDateTime($DbRow2['Time']).')</h3>';
-                                  $Output .= $DbRow2['Content'];
-                      if($this->System->User->Licence(LICENCE_MODERATOR))
-                        $Output .= '<div><a href="?Action=Edit">Upravit nejnovější</a> <a href="?Action=History">Historie</a></div>';
-                          } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                        } else 
-                        {
-                          $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
-                          if($DbResult2->num_rows > 0)
-                          {
-                                  $DbRow2 = $DbResult2->fetch_assoc();
-                            $Output = '<h3>'.$DbRow['Name'].'</h3>';
-                                  $Output .= $DbRow2['Content'];
-                      if($this->System->User->Licence(LICENCE_MODERATOR))
-                        $Output .= '<hr><div><a href="?Action=Edit">Upravit</a> <a href="?Action=History">Historie</a></div>';
-                          } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                        }
-                } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                return($Output);
-        }
-
-        function EditContent()
-        {
-                if($this->System->User->Licence(LICENCE_MODERATOR))
-                {
-                $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
-                $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-                if($DbResult->num_rows > 0)
-                {
-                        $DbRow = $DbResult->fetch_assoc();
-                        $Output = '<h3>Úprava '.$DbRow['Name'].'</h3>';
-                        $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
-                        if($DbResult2->num_rows > 0)
-                        {
-                                $DbRow2 = $DbResult2->fetch_assoc();
-                    $Output .= '<form action="?Action=EditSave" method="post">'.
-                    '<textarea name="content" rows="8" cols="80" onkeydown="ResizeTextArea(this)" class="textedit">'.$DbRow2['Content'].'</textarea><br/>'.
-                    '<input type="submit" name="save" value="Uložit"/> '.
-                    '<input type="button" name="cancel" value="Zrušit" onclick="location.href=\'?\'"/>'.
-                    '</form>';
-                        } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function SaveContent()
-        {
-                if($this->System->User->Licence(LICENCE_MODERATOR))
-                {
-                $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
-                $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-                if($DbResult->num_rows > 0)
-                {
-                        $DbRow = $DbResult->fetch_assoc();
-                        if(array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
-                        {
-                          $DbResult2 = $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
-                                'User' => $this->System->User->Id, 'Time' => 'NOW()', 'Page' => $DbRow['Id']));
-                          $Output = ShowMessage('Wiki stránka uložena', MESSAGE_INFORMATION);                     
-                        } else $Output = ShowMessage('Nezadána platná data', MESSAGE_CRITICAL);
-                        $Output .= $this->ShowContent();
-                } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ShowHistory()
-        {               
-                if($this->System->User->Licence(LICENCE_MODERATOR))
-                {
-                  $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
-                  $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
-                  if($DbResult->num_rows > 0)
-                  {
-                          $DbRow = $DbResult->fetch_assoc();
-                        
-                          $Output = '<h3>Historie stránky '.$DbRow['Name'].'</h3>';
-                          $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM `WikiPageContent` WHERE Page='.$DbRow['Id']);
-                        $DbRow2 = $DbResult2->fetch_row();
-                        $PageList = GetPageList($DbRow2[0]);
-                        
-                        $Output .= $PageList['Output'];
-                        $Output .= '<table class="BaseTable">';
-                        
-                          $TableColumns = array(
-                                        array('Name' => 'Time', 'Title' => 'Čas'),
-                                        array('Name' => 'User', 'Title' => 'Uživatel'),
-                                        array('Name' => 'Action', 'Title' => 'Akce'),
-                          );
-                          
-                          $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
-                          $Output .= $Order['Output'];
-                          
-                          $DbResult2 = $this->Database->query('SELECT *, (SELECT `Name` FROM `User` WHERE `User`.`ID`=`WikiPageContent`.`User`) AS `UserName` '.
-                                ' FROM `WikiPageContent` WHERE Page='.
-                        $DbRow['Id'].' '.$Order['SQL'].$PageList['SQLLimit']);
-                          while($PageContent = $DbResult2->fetch_assoc())
-                          {
-                                $Output .= '<tr>'.
-                                        '<td>'.HumanDateTime($PageContent['Time']).'</td>'.
-                                '<td><a href="'.$this->System->Link('/user.php?user='.$PageContent['User']).'">'.$PageContent['UserName'].'</a></td>'.                                                                                          
-                                        '<td><a href="?id='.$PageContent['Id'].'&amp;ver='.$PageContent['Id'].'">Zobrazit</a></td>';
-                                $Output .= '</tr>';
-                          }                     
-                      
-                          $Output .= '</table>'.
-                                  $PageList['Output'];
-                  } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
-                } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
-                return($Output);
-        }
-        
-        function ToHtml($text)
+  function Show()
+  {
+    if(array_key_exists('Action', $_GET))
+    {
+      if($_GET['Action'] == 'Edit') $Output = $this->EditContent();
+      else if($_GET['Action'] == 'EditSave') $Output = $this->SaveContent();
+      else if($_GET['Action'] == 'History') $Output = $this->ShowHistory();
+      else $Output = $this->ShowContent();
+    } else $Output = $this->ShowContent();
+    return($Output);
+  }
+
+  function ShowContent()
+  {
+    $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
+    $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      if(array_key_exists('ver', $_GET))
+      {
+        $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' AND Id='.$_GET['ver']*1);
+        if($DbResult2->num_rows > 0)
+        {
+          $DbRow2 = $DbResult2->fetch_assoc();
+          $Output = '<h3>Archív stránky '.$DbRow['Name'].' ('.HumanDateTime($DbRow2['Time']).')</h3>';
+          $Output .= $DbRow2['Content'];
+          if($this->System->User->Licence(LICENCE_MODERATOR))
+            $Output .= '<div><a href="?Action=Edit">Upravit nejnovější</a> <a href="?Action=History">Historie</a></div>';
+        } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+      } else
+      {
+        $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
+        if($DbResult2->num_rows > 0)
+        {
+          $DbRow2 = $DbResult2->fetch_assoc();
+          $Output = '<h3>'.$DbRow['Name'].'</h3>';
+          $Output .= $DbRow2['Content'];
+          if($this->System->User->Licence(LICENCE_MODERATOR))
+            $Output .= '<hr><div><a href="?Action=Edit">Upravit</a> <a href="?Action=History">Historie</a></div>';
+        } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+      }
+    } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function EditContent()
+  {
+    if($this->System->User->Licence(LICENCE_MODERATOR))
+    {
+    $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
+    $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      $Output = '<h3>Úprava '.$DbRow['Name'].'</h3>';
+      $DbResult2 = $this->Database->select('WikiPageContent', '*', 'Page='.$DbRow['Id'].' ORDER BY Time DESC LIMIT 1');
+      if($DbResult2->num_rows > 0)
+      {
+        $DbRow2 = $DbResult2->fetch_assoc();
+        $Output .= '<form action="?Action=EditSave" method="post">'.
+        '<textarea name="content" rows="8" cols="80" onkeydown="ResizeTextArea(this)" class="textedit">'.$DbRow2['Content'].'</textarea><br/>'.
+        '<input type="submit" name="save" value="Uložit"/> '.
+        '<input type="button" name="cancel" value="Zrušit" onclick="location.href=\'?\'"/>'.
+        '</form>';
+      } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function SaveContent()
+  {
+    if($this->System->User->Licence(LICENCE_MODERATOR))
+    {
+    $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
+    $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
+    if($DbResult->num_rows > 0)
+    {
+      $DbRow = $DbResult->fetch_assoc();
+      if(array_key_exists('content', $_POST) and array_key_exists('save', $_POST))
+      {
+        $DbResult2 = $this->Database->insert('WikiPageContent', array('Content' => stripslashes($_POST['content']),
+          'User' => $this->System->User->Id, 'Time' => 'NOW()', 'Page' => $DbRow['Id']));
+        $Output = ShowMessage('Wiki stránka uložena', MESSAGE_INFORMATION);
+      } else $Output = ShowMessage('Nezadána platná data', MESSAGE_CRITICAL);
+      $Output .= $this->ShowContent();
+    } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ShowHistory()
+  {
+    if($this->System->User->Licence(LICENCE_MODERATOR))
+    {
+      $PageName = $this->System->PathItems[count($this->System->PathItems) - 1];
+      $DbResult = $this->Database->select('WikiPage', 'Name, Id', 'NormalizedName="'.$PageName.'"');
+      if($DbResult->num_rows > 0)
+      {
+        $DbRow = $DbResult->fetch_assoc();
+
+        $Output = '<h3>Historie stránky '.$DbRow['Name'].'</h3>';
+        $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM `WikiPageContent` WHERE Page='.$DbRow['Id']);
+        $DbRow2 = $DbResult2->fetch_row();
+        $PageList = GetPageList($DbRow2[0]);
+
+        $Output .= $PageList['Output'];
+        $Output .= '<table class="BaseTable">';
+
+        $TableColumns = array(
+            array('Name' => 'Time', 'Title' => 'Čas'),
+            array('Name' => 'User', 'Title' => 'Uživatel'),
+            array('Name' => 'Action', 'Title' => 'Akce'),
+        );
+
+        $Order = GetOrderTableHeader($TableColumns, 'Time', 1);
+        $Output .= $Order['Output'];
+
+        $DbResult2 = $this->Database->query('SELECT *, (SELECT `Name` FROM `User` WHERE `User`.`ID`=`WikiPageContent`.`User`) AS `UserName` '.
+          ' FROM `WikiPageContent` WHERE Page='.
+          $DbRow['Id'].' '.$Order['SQL'].$PageList['SQLLimit']);
+        while($PageContent = $DbResult2->fetch_assoc())
+        {
+          $Output .= '<tr>'.
+            '<td>'.HumanDateTime($PageContent['Time']).'</td>'.
+            '<td><a href="'.$this->System->Link('/user.php?user='.$PageContent['User']).'">'.$PageContent['UserName'].'</a></td>'.
+            '<td><a href="?id='.$PageContent['Id'].'&amp;ver='.$PageContent['Id'].'">Zobrazit</a></td>';
+          $Output .= '</tr>';
+        }
+
+        $Output .= '</table>'.
+          $PageList['Output'];
+      } else $Output = ShowMessage('Wiki stránka nenalezena', MESSAGE_CRITICAL);
+    } else $Output = ShowMessage(T('Access denied'), MESSAGE_CRITICAL);
+    return($Output);
+  }
+
+  function ToHtml($text)
   {
     $text = preg_replace('/&lt;source lang=&quot;(.*?)&quot;&gt;(.*?)&lt;\/source&gt;/', '<pre lang="$1">$2</pre>', $text);