Changeset 425

Timestamp:

Apr 8, 2010, 7:58:16 AM (15 years ago)

Author:

george

Message:

• Upraveno: Doplněny upravené soubory do vývojové větve CombinedTextTables.
• Nastavení ignorování obsahu složek s ikonami u AoWoW.

Files:

• aowow/images/icons/large (modified) (1 prop)
• aowow/images/icons/medium (modified) (1 prop)
• aowow/images/icons/small (modified) (1 prop)
• aowow/images/icons/tiny (modified) (1 prop)
• branches/CombinedTextTables/TranslationList.php (modified) (15 diffs)
• branches/CombinedTextTables/action.php (modified) (2 diffs)
• branches/CombinedTextTables/form.php (modified) (7 diffs)
• branches/CombinedTextTables/includes/global_function.php (modified) (2 diffs)
• branches/CombinedTextTables/save.php (modified) (7 diffs)
• branches/CombinedTextTables/sql/updates/420.sql (added)
• branches/CombinedTextTables/statistic.php (modified) (1 diff)
• branches/CombinedTextTables/transform.php (added)

branches/CombinedTextTables/TranslationList.php

@@ -3 +3 @@
 include('includes/global.php');
 
-function WriteQuests($Query)
-{
-  global $Database, $TranslationTree, $GroupId, $Table, $Action;
+function ShowTable($Group, $Condition = '')
+{
+  global $Database, $Table, $Action;
  
+   $Query = 'SELECT `T`.*, `TranslationItem`.`Value`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) AS `UserName`'.
+     ' FROM `Translation` AS `T`'.
+     ' JOIN `TranslationItem` ON (`TranslationItem`.`Translation` = `T`.`Id`) AND (`TranslationItem`.`Sequence` = 1)'.
+     ' WHERE (`T`.`Group` = '.$Group['Id'].')';
+  if($Condition != '') $Query .= ' AND '.$Condition;
+   
   // Get total item count
   $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM ('.$Query.') AS `T`');
@@ -15 +21 @@
 
   $TableColumns = array(
-    array('Name' => 'ID', 'Title' => 'Pořadové číslo'), 
+    array('Name' => 'Id', 'Title' => 'Pořadové číslo'), 
     array('Name' => 'Entry', 'Title' => 'Identifikační číslo'), 
-    array('Name' => $TranslationTree[$GroupId]['Items'][0]['Column'], 'Title' => 'Název'), 
+    array('Name' => 'Value', 'Title' => 'Název'), 
     array('Name' => 'VersionStart', 'Title' => 'Verze'), 
   );
@@ -31 +37 @@
   while($Line = mysql_fetch_assoc($DbResult)) 
   {
-    echo('<tr><td><a href="form.php?group='.$GroupId.'&amp;ID='.$Line['ID'].'">'.$Line['ID'].'</a></td><td>'.$Line['Entry'].'</td>'.
-      '<td>'.htmlspecialchars($Line[$TranslationTree[$GroupId]['Items'][0]['Column']]).'</td>'.
+    echo('<tr><td><a href="form.php?group='.$Group['Id'].'&amp;ID='.$Line['Id'].'">'.$Line['Id'].'</a></td><td>'.$Line['Entry'].'</td>'.
+      '<td>'.htmlspecialchars($Line['Value']).'</td>'.
       '<td>'.GetVersionWOW($Line['VersionStart']).'-'.GetVersionWOW($Line['VersionEnd']).'</td>');
     if($Action == 'selection') echo('<td>'.$Line['CountQuest'].'</td>'); 
@@ -43 +49 @@
 }
 
-function Nontranslated()
-{
-  global $GroupId, $Table;
-  
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> -> '.
-  '<a title="Zde můžete začít překládat" href="?group='.$GroupId.'&amp;action=selection">Nepřeložené texty</a> - > '.
+function NonTranslated($Group)
+{
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> -> '.
+  '<a title="Zde můžete začít překládat" href="?group='.$Group['Id'].'&amp;action=selection">Nepřeložené texty</a> - > '.
   '<strong>Vypsání nepřeložených textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT * FROM `'.$Table.'` AS `items` WHERE (`items`.`Language` = 0) AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`Entry` = `items`.`Entry`) AND (`sub`.`Complete`=1) AND (`sub`.`VersionStart` = `items`.`VersionStart`) AND (`sub`.`VersionEnd` = `items`.`VersionEnd`))');
+  ShowTable($Group, '(`Language` = 0)', ' AND `Id` NOT IN (SELECT `Id` FROM `Translation` AS `Sub`'.
+  ' WHERE (`Sub`.`Language` <> 0)'.
+  ' AND (`Sub`.`Entry` = `T`.`Entry`)'.
+  ' AND (`Sub`.`Complete` = 1)'.
+  ' AND (`Sub`.`VersionStart` = `T`.`VersionStart`) AND (`Sub`.`VersionEnd` = `T`.`VersionEnd`))');
 }
 
@@ -92 +100 @@
 }
 
-function Noncomplete()
-{
-  global $GroupId, $Table, $BuildNumber_max, $Database;
-
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
-        <a title="Zde můžete začít překládat" href="?group='.$GroupId.'&amp;action=selection">nedokončené texty</a> - > 
+function NonComplete($Group)
+{
+  global $BuildNumber_max;
+
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> ->
+        <a title="Zde můžete začít překládat" href="?group='.$Group['Id'].'&amp;action=selection">nedokončené texty</a> - > 
         <strong>Vypsání nedokončených textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT `items`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` AS `items` JOIN `User` ON `User`.`ID` = `items`.`User` WHERE (`items`.`Language` = 0) AND
-    NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> 0) AND (`sub`.`Entry` = `items`.`Entry`) AND (`sub`.`Complete` = 1) AND (`VersionEnd` = '.$BuildNumber_max.')) AND
-   EXISTS(SELECT 1 FROM `'.$Table.'` AS `sub2` WHERE (`sub2`.`Language` <> 0) AND (`sub2`.`Entry` = `items`.`Entry`) AND (`sub2`.`Complete` = 0) AND (`VersionEnd` = '.$BuildNumber_max.')) AND (`items`.`VersionEnd` = '.$BuildNumber_max.')');
-}
-
-function Translate()
-{
-  global $GroupId, $Table, $BuildNumber_max, $Database;
-
-  echo('<a title="Zobrazit překlady podle vlasního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr překladů</a> ->
-     <a title="Přeložené texty, můžete zde hlasovat, nebo opravovat texty" href="?group='.$GroupId.'&amp;action=Translate">Přeložené texty</a><br /><br />');
-      
-  WriteQuests('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` JOIN `User` ON `User`.`ID` = `'.$Table.'`.`User` WHERE (`'.$Table.'`.`Language` <> 0) AND (`'.$Table.'`.`Complete` = 1)');
-}
-
-function UserTranslated()
-{
-  global $GroupId, $Table, $User;
-  
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
-        <a title="Přeložené questy přilášeného uživatele" href="?group='.$GroupId.'&amp;action=my">Moje překlady</a><br /><br />');
-  WriteQuests('SELECT `'.$Table.'`.*, `User`.`Name` AS `UserName` FROM `'.$Table.'` JOIN `User` ON `User`.`id` = `'.$Table.'`.`User` WHERE `'.$Table.'`.`User` = '.$User->Id);
-}
-
-function UserUnfinished()
-{
-  global $GroupId, $Table, $User;
-
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
-    <a title="Nedokončené texty" href="?group='.$GroupId.'&amp;action=mydevelop">Rozepsané překlady</a><br /><br />');
-  WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `User` = '.$User->Id.' AND `Complete` = 0');
+  ShowTable($Group, '(`T`.`Language` = 0)'.
+    ' AND NOT EXISTS (SELECT 1 FROM `Translation` AS `Sub` WHERE (`Sub`.`Language` <> 0) AND (`Sub`.`Entry` = `T`.`Entry`) AND (`Sub`.`Complete` = 1) AND (`VersionEnd` = '.$BuildNumber_max.'))'.
+    ' AND EXISTS (SELECT 1 FROM `Translation` AS `Sub2` WHERE (`Sub2`.`Language` <> 0) AND (`Sub2`.`Entry` = `T`.`Entry`) AND (`Sub2`.`Complete` = 0) AND (`VersionEnd` = '.$BuildNumber_max.')) AND (`T`.`VersionEnd` = '.$BuildNumber_max.')');
+}
+
+function Translated($Group)
+{
+  global $BuildNumber_max, $Database;
+
+  echo('<a title="Zobrazit překlady podle vlasního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr překladů</a> -> <a title="Přeložené texty, můžete zde hlasovat, nebo opravovat texty" href="?group='.$Group['Id'].'&amp;action=Translate">Přeložené texty</a><br /><br />');      
+  
+  ShowTable($Group, '(`T`.`Language` <> 0) AND (`T`.`Complete` = 1)');
+}
+
+function UserTranslated($Group)
+{
+  global $User;
+  
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> ->
+        <a title="Přeložené questy přilášeného uživatele" href="?group='.$Group['Id'].'&amp;action=my">Moje překlady</a><br /><br />');
+        
+  ShowTable($Group, '(`T`.`User` = '.$User->Id.')');
+}
+
+function UserUnfinished($Group)
+{
+  global $User;
+
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> ->
+    <a title="Nedokončené texty" href="?group='.$Group['Id'].'&amp;action=mydevelop">Rozepsané překlady</a><br /><br />');
+  
+  ShowTable($Group, '(`T`.`User` = '.$User->Id.') AND (`T`.`Complete` = 0)');
 }
 
@@ -153 +162 @@
 }
 
-function UserAll()
-{
-  global $Database, $Table, $GroupId, $TranslationTree;
-  
+function UserAll($Group)
+{
+  global $Database, $TranslationTree;
+  
+  if(!array_key_exists('user', $_GET) or !is_numeric($_GET['user'])) ErrorMessage('Nezadáno id překladatele');
   $ID = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID` = '.$_GET['user']);
   $Line = mysql_fetch_row($ID);
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a>'.
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a>'.
   ' -> <strong>Počty překladů uživatele '.$Line[0].': </strong><br /><br />');
   
@@ -165 +175 @@
   $Total = 0;
   foreach($TranslationTree as $Group)
-    if($Group['TablePrefix'] != '')
-    {
+  {
       if(array_key_exists('not', $_GET)) 
       {
-        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `Complete` = 0 AND `User`='.$_GET['user'];
+        $sql = 'SELECT COUNT(*) FROM `Translation` WHERE (`Complete` = 0) AND (`User`='.$_GET['user'].') AND (`Group` = '.$Group['Id'].')';
         $ID = $Database->SQLCommand($sql);
         $Line = mysql_fetch_row($ID);
         $GroupId = $Group['Id'];
-        echo('<tr><td><a href="?group='.$GroupId.'&amp;action=userid&amp;not&amp;user='.$_GET['user'].'">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
+        echo('<tr><td><a href="?group='.$Group['Id'].'&amp;action=userid&amp;not&amp;user='.$_GET['user'].'">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
         $Total += $Line[0];
       } else 
       {
-        $sql = 'SELECT COUNT(*) FROM `'.$Group['TablePrefix'].'` WHERE `User`='.$_GET['user'];
+        $sql = 'SELECT COUNT(*) FROM `Translation` WHERE (`User`='.$_GET['user'].') AND (`Group` = '.$Group['Id'].')';
         $ID = $Database->SQLCommand($sql);
         $Line = mysql_fetch_row($ID);
         $GroupId = $Group['Id'];
-        echo('<tr><td><a href="?group='.$GroupId.'&amp;action=userid&amp;user='.$_GET['user'].'">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
+        echo('<tr><td><a href="?group='.$Group['Id'].'&amp;action=userid&amp;user='.$_GET['user'].'">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
         $Total += $Line[0];
       }
@@ -221 +230 @@
 }
 
-function TranslatedByUserId()
-{
-  global $Database, $Table, $GroupId;
-  
-  if(array_key_exists('user', $_GET))
+function TranslatedByUserId($Group)
+{
+  global $Database;
+  
+  if(array_key_exists('user', $_GET) and is_numeric($_GET['user']))
   {
     $ID = $Database->SQLCommand('SELECT `Name` FROM `User` WHERE `ID` = '.($_GET['user'] * 1));
@@ -231 +240 @@
     {
       $Line = mysql_fetch_row($ID);
-      echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> -> '.
+      echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> -> '.
         '<strong>Vypis překladů uživatele '.$Line[0].': </strong><br /><br />');
       if(array_key_exists('not', $_GET)) 
-        WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Complete` = 0) AND (`User` = '.$_GET['user'].')');
-      else WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `User` = '.$_GET['user']);
+        ShowTable($Group, '(`T`.`Complete` = 0) AND (`T`.`User` = '.$_GET['user'].')');
+      else ShowTable($Group, '`T`.`User` = '.$_GET['user']);
     } else echo('Nebyl nalezen uživatel se zadaným id');
   } else echo('Je nutno zadat id uživatele.');
 }
 
-function TranslatedSearch()
-{
-  global $Table, $GroupId, $TranslationTree;
+function TranslatedSearch($Group)
+{
+  global $TranslationTree;
   
   if(array_key_exists('search', $_GET)) $Search = $_GET['search'];
@@ -248 +257 @@
   else ErrorMessage('Nebyl zadán text k vyhledání.');
   
-  $sql = 'SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
-    OR `Entry` LIKE "%'.$Search.'%"
-    OR `Language` LIKE "%'.$Search.'%"
-    OR `User` LIKE "%'.$Search.'%"
-    OR `Complete` LIKE "%'.$Search.'%"';
-  foreach($TranslationTree[$GroupId]['Items'] as $Item)
-  {
-    if($Item['Column'] != '') $sql .= ' OR `'.$Item['Column'].'` LIKE "%'.$Search.'%"';
-  }
-    
-  WriteQuests($sql);
+  $Filter = '(`T`.`Id` LIKE "%'.$Search.'%")'.
+    ' OR (`T`.`Entry` LIKE "%'.$Search.'%")'.
+    ' OR (`T`.`Language` LIKE "%'.$Search.'%")'.
+    ' OR (`T`.`User` LIKE "%'.$Search.'%")'.
+    ' OR (`T`.`Complete` LIKE "%'.$Search.'%")';
+    //' OR (`T`.`Id` IN (SELECT `Id` FROM `TranslationItem` WHERE (`TranslationItem`.`Translate` = `T`.`Id`) AND (`TranslationItem`.`Value` LIKE "%'.$Search.'%"))';
+   
+  ShowTable($Group, $Filter);
 }
 
@@ -274 +280 @@
 }
 
-function TranslatedAll()
-{
-  global $GroupId, $Table;
-  
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a> ->
-        <a title="Zde můžete začít překládat" href="?group='.$GroupId.'&amp;action=selection">Nepřeložené texty</a> - > 
+function TranslatedAll($Group)
+{
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a> ->
+        <a title="Zde můžete začít překládat" href="?group='.$Group['Id'].'&amp;action=selection">Nepřeložené texty</a> - > 
         <strong>Výpis všech textů s limitem na stránku</strong><br /><br />');
 
-  WriteQuests('SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`'.$Table.'`.`Language` = 0)');
-}
-
-function TranslatedFilter()
-{
-  global $Table, $GroupId, $Database, $User;
-  
-  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$GroupId.'&amp;action=filter">Filtr textů</a><br /><br /><br />'.
+  ShowTable($Group, '(`T`.`Language` = 0)');
+}
+
+function TranslatedFilter($Group)
+{
+  global $Database, $User;
+  
+  echo('<a title="Zobrazit texty podle vlastního filtru" href="?group='.$Group['Id'].'&amp;action=filter">Filtr textů</a><br /><br /><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;action=all">Všechny texty</a></td>'.
+    '<tr><td><a title="Všechny dostupné texty ve skupině" href="?group='.$Group['Id'].'&amp;action=all">Všechny texty</a></td>'.
     '<td>Zobrazit všechny dostupné texty ve skupině.</td></tr>'.
-    '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$GroupId.'&amp;action=Translate">Přeložené texty</a></td>'.
+    '<tr><td><a title="Přeložené texty, můžete zde hlasovat, nebo text opravovat" href="?group='.$Group['Id'].'&amp;action=Translate">Přeložené texty</a></td>'.
     '<td>Zobrazit pouze již přeložené texty.</td></tr>'.
-    '<tr><td><a title="Nepřeložené texty" href="?group='.$GroupId.'&amp;action=notran">Nepřeložené texty</a></td>'.
+    '<tr><td><a title="Nepřeložené texty" href="?group='.$Group['Id'].'&amp;action=notran">Nepřeložené texty</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;action=nocomplete">Nedokončené texty</a></td>'.
+    '<tr><td><a title="Nedokončené texty" href="?group='.$Group['Id'].'&amp;action=nocomplete">Nedokončené texty</a></td>'.
     '<td>Texty označené jako rozpracované.</td></tr>');
 
   if($User->Licence(LICENCE_USER)) 
   {
-    echo('<tr><td><a title="Nedokončené texty" href="?group='.$GroupId.'&amp;action=mydevelop">Rozepsané texty</a></td>
+    echo('<tr><td><a title="Nedokončené texty" href="?group='.$Group['Id'].'&amp;action=mydevelop">Rozepsané texty</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;action=my">Moje překlady</a></td>
+          <tr><td><a title="Přeložené texty přihlášeného uživatele" href="?group='.$Group['Id'].'&amp;action=my">Moje překlady</a></td>
           <td>Přeložené texty přihlášeného uživatele</td></tr>');
   }
         
-  echo('<tr><td><form action="?group='.$GroupId.'&amp;action=users" method="post"><div>'.
+  echo('<tr><td><form action="?group='.$Group['Id'].'&amp;action=users" method="post"><div>'.
     '<select name="users[]" size="10" multiple="multiple" class="UserList">');
         
   $ID = $Database->SQLCommand('SELECT `Name`, `ID` FROM `User` WHERE
-    EXISTS(SELECT 1 FROM `'.$Table.'` WHERE `User` = `User`.`ID`) ORDER BY `Name`');
+    EXISTS(SELECT 1 FROM `Translation` WHERE (`Translation`-`User` = `User`.`ID`) AND (`Translation`.`Group` = '.$Group['Id'].')) ORDER BY `Name`');
+  echo(mysql_error());
   if($ID)
   while($Line = mysql_fetch_assoc($ID))
@@ -322 +327 @@
     Vybrat více uživatelů můžete pomocí CTRL+click</td></tr>');
 
-  echo('<tr><td><form action="?group='.$GroupId.'&amp;action=search" method="post"><div>'.
+  echo('<tr><td><form action="?group='.$Group['Id'].'&amp;action=search" method="post"><div>'.
     '<input type="text" name="search" size="8" />'.
     '<input type="submit" value="Hledat" />'.
@@ -328 +333 @@
     '</td><td>Vyhledat pomocí textu</td></tr>');
           
-  echo('<tr><td><form action="?group='.$GroupId.'&amp;action=searchentry" method="post"><div>'.
+  echo('<tr><td><form action="?group='.$Group['Id'].'&amp;action=searchentry" method="post"><div>'.
     '<input type="text" name="ID" size="8" />'.
     '<input type="submit" value="Hledat" />'.
@@ -341 +346 @@
 
 $GroupId = LoadGroupIdParameter();
-$Table = $TranslationTree[$GroupId]['TablePrefix'];
-if(array_key_exists('action', $_GET)) $Action = $_GET['action']; else $Action = '';
-
-$DbResult = $Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM `'.$TranslationTree[$GroupId]['TablePrefix'].'`');
+$Group = $TranslationTree[$GroupId];
+if(array_key_exists('action', $_GET)) $Action = $_GET['action']; 
+  else $Action = '';
+
+$DbResult = $Database->SQLCommand('SELECT MAX(`VersionEnd`) FROM `Translation`');
 $ID = mysql_fetch_row($DbResult);
 $BuildNumber_max = $ID[0];
@@ -351 +357 @@
   echo('Skupina: <strong>'.$TranslationTree[$GroupId]['Name'].'</strong><br />');
 
-if($Action == 'notran') Nontranslated();
+if($Action == 'notran') NonTranslated($Group);
 else if($Action == 'connexion') Connexion();
 else if($Action == 'connexion_list') ConnexionList();
-else if($Action == 'nocomplete') Noncomplete();
-else if($Action == 'Translate') Translate();
-else if(($Action == 'my') and $User->Licence(LICENCE_USER)) UserTranslated();
-else if(($Action == 'mydevelop') and $User->Licence(LICENCE_USER)) UserUnfinished();
+else if($Action == 'nocomplete') NonComplete($Group);
+else if($Action == 'Translate') Translated($Group);
+else if(($Action == 'my') and $User->Licence(LICENCE_USER)) UserTranslated($Group);
+else if(($Action == 'mydevelop') and $User->Licence(LICENCE_USER)) UserUnfinished($Group);
 else if($Action == 'users') UserSelected();
-else if($Action == 'userall') UserAll();
+else if($Action == 'userall') UserAll($Group);
 else if($Action == 'grouplist') GroupList();
-else if($Action == 'userid') TranslatedByUserId();
-else if($Action == 'search') TranslatedSearch();
+else if($Action == 'userid') TranslatedByUserId($Group);
+else if($Action == 'search') TranslatedSearch($Group);
 else if($Action == 'searchentry') SearchEntry();
-else if($Action == 'all') TranslatedAll();
-else if($Action == 'filter') TranslatedFilter();
+else if($Action == 'all') TranslatedAll($Group);
+else if($Action == 'filter') TranslatedFilter($Group);
 else echo('Neznámá akce');
       

branches/CombinedTextTables/action.php

@@ -12 +12 @@
   echo('<table class="BaseTable"><tr><th>Skupina</th><th>Výsledků</th></tr>');
   foreach($TranslationTree as $Group) 
-  {
-    $Table = $Group['TablePrefix'];
-  
-    $sql = 'SELECT COUNT(*) FROM `'.$Table.'` WHERE `ID` LIKE "%'.$Search.'%"
-      OR `Entry` LIKE "%'.$Search.'%"
-      OR `User` LIKE "%'.$Search.'%"
-      OR `Complete` LIKE "%'.$Search.'%"';
-    foreach($Group['Items'] as $Item) 
-    {
-      if($Item['Column'] != '') $sql .= ' OR `'.$Item['Column'].'` LIKE "%'.$Search.'%"';
-    }
+  { 
+    $sql = 'SELECT COUNT(*) FROM `Translation` WHERE (`ID` LIKE "%'.$Search.'%")'.
+      ' OR (`Entry` LIKE "%'.$Search.'%")'.
+      ' OR (`User` LIKE "%'.$Search.'%")'.
+      ' OR (`Complete` LIKE "%'.$Search.'%")';
     $Line = mysql_fetch_row($Database->SQLCommand($sql));
     echo('<tr><td><a href="TranslationList.php?group='.$Group['Id'].'&amp;action=search&amp;search='.$Search.'">'.$Group['Name'].'</a></td><td>'.$Line[0].'</td></tr>');
@@ -256 +250 @@
 
 $GroupId = LoadGroupIdParameter();
-$Table = $TranslationTree[$GroupId]['TablePrefix'];
+$Group = $TranslationTree[$GroupId];
 if(array_key_exists('action', $_GET)) $Action = $_GET['action']; 
   else $Action = '';

branches/CombinedTextTables/form.php

@@ -5 +5 @@
 function ColorNames($Text, $names) 
 {
-  
-   // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
-  foreach($names as $Line) {
-   if ($Line[3] <> '') {
-     $Text = str_replace($Line[2],'<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>',$Text);
-     $Text = str_replace(strtolower($Line[2]),'<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>',$Text);
-   } else {
-       $Text = str_replace($Line[2],'<span Title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>',$Text);
-       $Text = str_replace(strtolower($Line[2]),'<span Title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>',$Text);
-     }
+  // $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+  foreach($names as $Line) 
+  {
+    if($Line[3] <> '') 
+    {
+      $Text = str_replace($Line[2], '<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>',$Text);
+      $Text = str_replace(strtolower($Line[2]), '<span Title="Byl nalezen překlad: '.$Line[3].'" class="edit">'.$Line[2].'</span>', $Text);
+    } else 
+    {
+      $Text = str_replace($Line[2], '<span Title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>', $Text);
+      $Text = str_replace(strtolower($Line[2]), '<span Title="Jméno bylo nalezeno v názvech a můžete ho přeložit. Začnete kliknutím na: Vyhledat v názvech" class="edit">'.$Line[2].'</span>', $Text);
+    }
   }
   return $Text;
@@ -22 +24 @@
 
 $GroupId = LoadGroupIdParameter();
-$Table = $TranslationTree[$GroupId]['TablePrefix'];
+$Group = $TranslationTree[$GroupId];
 if(array_key_exists('action', $_GET)) $Action = $_GET['action']; 
   else $Action = '';
 
-if(array_key_exists('ID', $_GET)) 
+if(array_key_exists('ID', $_GET) and is_numeric($_GET['ID'])) 
 {
-  $TextID = $_GET['ID'] * 1;  
+  $TextID = $_GET['ID'];  
 
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE `ID` = '.$TextID);
+  $DbResult = $Database->SQLCommand('SELECT * FROM `Translation` WHERE `ID` = '.$TextID);
   $Line = mysql_fetch_assoc($DbResult);
   if(!$Line) ErrorMessage('Překlad nenalezen.');
     
-  $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE `Language` = 0  AND `Entry` = '.$Line['Entry'].' AND `VersionEnd` = '.$Line['VersionEnd'].' LIMIT 1');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `Translation` WHERE (`Language` = 0) AND (`Entry` = '.$Line['Entry'].') AND (`VersionEnd` = '.$Line['VersionEnd'].') LIMIT 1');
   $LineAJ = mysql_fetch_assoc($DbResult);
   if(!$Line) ErrorMessage('Anglický originál k překladu nenalezen.');
+  $DbResult = $System->Database->query('SELECT * FROM `TranslationItem` WHERE `Translation`='.$LineAJ['Id']);
+  while($DbRow = $DbResult->fetch_assoc())
+    $LineAJ['Item'.$DbRow['Sequence']] = $DbRow['Value'];
   
   $IDUser = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID` = '.$Line['User']);
@@ -45 +50 @@
   if(($Line['Language'] <> 0) and ($LineUser['Name'] <> '')) 
     echo('Přeložil: <strong>'.$LineUser['Name'].'</strong> <br />');
-  if(($Line['Take'] <> 0) and ($Line['Take'] <> $Line['ID'])) 
+  if(($Line['Original'] <> 0) and ($Line['Original'] <> $Line['Id'])) 
   {
-    $Language = mysql_fetch_assoc($Database->SQLCommand('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `'.$Table.'` WHERE `ID` = '.$Line['Take']));
+    $Language = mysql_fetch_assoc($Database->SQLCommand('SELECT `Language`,`VersionStart`,`VersionEnd` FROM `Translation` WHERE `ID` = '.$Line['Original']));
     // echo $Language['Language'].'  '.$Line['Take'];
     if($Language['Language'] <> 0)
-      echo('Převzato z: <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Take'].'">'.$Line['Take'].'</a> <br />');
+      echo('Převzato z: <a href="form.php?group='.$GroupId.'&amp;ID='.$Line['Original'].'">'.$Line['Original'].'</a> <br />');
   }
   echo('Text: ');
@@ -63 +68 @@
   echo('<br />');
    
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE `Entry` = '.$Line['Entry'].' AND `Language` <> 0');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Translation` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> 0)');
   $Version = mysql_fetch_row($DbResult);
   $Version = $Version[0];
@@ -75 +80 @@
       <option value="-1">Vyberte text k porovnání</option>
       <option value="-1">Zobrazit/porovnat všechny</option>'); 
-    $DataID = $Database->SQLCommand('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'].')');  
+    $DataID = $Database->SQLCommand('SELECT *, (SELECT `User`.`Name` AS `UserName` FROM `User` WHERE `User`.`ID` = `Translate`.`User`) AS `UserName` FROM `Translate` WHERE (`Entry` = '.$Line['Entry'].') AND (`Id` <> '.$Line['Id'].')');  
     while($version = mysql_fetch_array($DataID))
     {     
-      if ($version['ID'] == $Line['Take']) echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$version['User'].' (převzato)</option>');   
+      if ($version['Id'] == $Line['Original']) echo('<option value="'.$version['Id'].'">'.$version['Id'].' - '.$version['User'].' (převzato)</option>');   
       else 
       {
         if($version['Language'] == 0) $version['UserName'] = 'Předloha';
-        echo('<option value="'.$version['ID'].'">'.$version['ID'].' - '.$Version['UserName'].' ('.GetVersionWOW($version['VersionStart']).' - '.GetVersionWOW($version['VersionEnd']).')</option>');
+        echo('<option value="'.$version['Id'].'">'.$version['Id'].' - '.$Version['UserName'].' ('.GetVersionWOW($version['VersionStart']).' - '.GetVersionWOW($version['VersionEnd']).')</option>');
       }
     }
@@ -95 +100 @@
   if($User->Licence(LICENCE_USER)) 
   {
-    if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) echo('<a href="dictionary.php?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>');
+    if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) echo('<a href="dictionary.php?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>');
     echo(' <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);
+    //FollowingTran($TextID, $Table, $GroupId, true); 
+    //FollowingTran($TextID, $Table, $GroupId);
   }
 
@@ -128 +133 @@
   echo('</td></tr>');
 
-  //zvýrazňování jmen
-    $Text = '';
-    foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-      if($TextItem['Visible'] == 1)
-        $Text = $Text.' '.$LineAJ[$TextItem['Column']];
+  /*
+  // zvýrazňování jmen
+  $Text = '';
+  foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
+    if($TextItem['Visible'] == 1)
+      if(array_key_exists('Item'.$TextItem['Sequence'], $LineAJ))
+        $Text = $Text.' '.$LineAJ['Item'.$TextItem['Sequence']];
 
-  if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) {
-  //<span class="edit">barvou.</span>
-    $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text','TextCreature' => 'name'));
-  } else {
-    $names = GetTranslatNames($Text,0,array('Dictionary' => 'Text'));
+  if(($GroupId < 4) or ($GroupId == 10) or ($GroupId == 11)) 
+  {
+    //<span class="edit">barvou.</span>
+    $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text', 'TextCreature' => 'name'));
+  } else 
+  {
+    $names = GetTranslatNames($Text, 0, array('Dictionary' => 'Text'));
   }
   //print_r($names);
-
-  foreach($TranslationTree[$GroupId]['Items'] as $Index => $TextItem)
-  if($TextItem['Visible'] == 1)
-  {          
-    if(($LineAJ[$TextItem['Column']] <> '') or ($Line[$TextItem['Column']] <> ''))  
+  */
+  $names = array();
+  
+  $DbResult = $System->Database->query('SELECT * FROM TranslationItem WHERE Translation='.$TextID);
+  while($TranslationItem = $DbResult->fetch_assoc())
+  {
+    $TextItem = $TranslationTree[$GroupId]['Items'][$TranslationItem['Sequence']];
+    if($TextItem['Visible'] == 1)
+    {          
+      if(($LineAJ['Item'.$TranslationItem['Sequence']] <> '') or ($TranslationItem['Value'] <> ''))  
+      {
+        //if($TextItem['Name'] == 'Text' AND (($Table == 'global_strings') OR ($Table == 'glue_strings'))) echo('<tr><th>'.$LineAJ['ShortCut'].'</th>');
+        //else 
+        echo('<tr><th>'.$TextItem['Name'].'</th>');
+        
+        echo('<td>'.str_replace("\n", '<br/>', ColorNames(htmlspecialchars($LineAJ['Item'.$TranslationItem['Sequence']]),$names)).'</td>'.
+        '<td><textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="Item'.$TranslationItem['Sequence'].'" name="Item'.$TranslationItem['Sequence'].'">'.htmlspecialchars($TranslationItem['Value']).'</textarea></td></tr>');
+      }
+    } else
     {
-      if ($TextItem['Name'] == 'Text' AND (($Table == 'global_strings') OR ($Table == 'glue_strings'))) echo('<tr><th>'.$LineAJ['ShortCut'].'</th>');
-        else echo('<tr><th>'.$TextItem['Name'].'</th>');
-      echo('<td>'.str_replace("\n", '<br/>', ColorNames(htmlspecialchars($LineAJ[$TextItem['Column']]),$names)).'</td>
-      <td><textarea rows="8" cols="40" onkeydown="ResizeTextArea(this)" class="textedit" id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'">'.htmlspecialchars($Line[$TextItem['Column']]).'</textarea></td></tr>');
+      echo('<input id="Item'.$TranslationItem['Sequence'].'" name="Item'.$TranslationItem['Sequence'].'" type="hidden" value="'.htmlspecialchars($TranslationItem['Value']).'" />');
     }
-  } else
-  {
-    echo('<input id="'.$TextItem['Column'].'" name="'.$TextItem['Column'].'" type="hidden" value="'.htmlspecialchars($Line[$TextItem['Column']]).'" />');
   }
   echo('</table></div></form>');

branches/CombinedTextTables/includes/global_function.php

@@ -238 +238 @@
     $Result[$DbRow['Id']] = $DbRow;
   }
-  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY `DBCColumnIndex`');
+  $DbResult = $Database->SQLCommand('SELECT * FROM `GroupItem` ORDER BY `Sequence`');
   while($DbRow = mysql_fetch_assoc($DbResult))
   {
-    $Result[$DbRow['Group']]['Items'][] = $DbRow;
+    $Result[$DbRow['Group']]['Items'][$DbRow['Sequence']] = $DbRow;
   }
   return($Result);
@@ -469 +469 @@
   {
     //echo $Value['TablePrefix'].'='.$Table.'<br>';
-      if ($Value['TablePrefix'] == $Table) return $TableID;
+    if($Value['TablePrefix'] == $Table) return($TableID);
   }
 }

branches/CombinedTextTables/save.php

@@ -10 +10 @@
 $GroupId = LoadGroupIdParameter();
 $Group = $TranslationTree[$GroupId];
-$Table = $Group['TablePrefix'];
 if($User->Licence(LICENCE_USER)) 
 {
@@ -22 +21 @@
     
     // Get source text record from database by ID
-    $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
+    $DbResult = $System->Database->query('SELECT * FROM `Translation` WHERE (`Id`='.$TextID.') AND (`Group` = '.$Group['Id'].')');
     if($DbResult->num_rows > 0)
     {
@@ -28 +27 @@
       
       // Get data for english original
-      $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].') AND (`Language` = 0) AND (`VersionStart` = '.$SourceText['VersionStart'].') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
-      if($DbResult->num_rows > 0)
+      $DbResult = $System->Database->query('SELECT * FROM `Translation` WHERE (`Entry`='.$SourceText['Entry'].') AND (`Language` = 0) AND (`VersionStart` = '.$SourceText['VersionStart'].') AND (`VersionEnd` = '.$SourceText['VersionEnd'].') AND (`Group` = '.$Group['Id'].')');
+      if($DbResult->num_rows > 0) 
       {
         $EnglishText = $DbResult->fetch_assoc();
@@ -39 +38 @@
             $Filter .= ' AND (`'.$GroupItem['Column'].'` = "'.$EnglishText[$GroupItem['Column']].'")';
         
-        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0)'.$Filter);
+        $DbResult = $System->Database->query('SELECT * FROM `Translation` WHERE (`Language` = 0) AND (`Group` = '.$Group['Id'].')'.$Filter);
         while($DbRow = $DbResult->fetch_assoc())
         {         
           // Get user translation paired to found english item entry
-          $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.') AND (`Entry` = '.$DbRow['Entry'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
+          $DbResult2 = $System->Database->query('SELECT * FROM `Translation` WHERE (`User` = '.$User->Id.') AND (`Entry` = '.$DbRow['Entry'].') AND (`VersionStart` = '.$SourceText['VersionStart'].') AND (`VersionEnd` = '.$SourceText['VersionEnd'].') AND (`Group` = '.$Group['Id'].')');
           if($DbResult2->num_rows > 0)
           {
@@ -56 +55 @@
             
             // Update user translation
-            $System->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
+            $System->Database->query('UPDATE `Translation` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
             
             echo('Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy!<br />');
@@ -63 +62 @@
           {
             // Insert new user translation
-            $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `Complete`, `User`, `Take`';
-            $Values = $DbRow['Entry'].', '.$DbRow['VersionStart'].', '.$DbRow['VersionEnd'].', '.$Language.', '.$Complete.', '.$User->Id.', '.$SourceText['ID'];
+            $Columns = '`Group`, `Entry`, `VersionStart`, `VersionEnd`, `Language`, `Complete`, `User`, `Take`';
+            $Values = $DbRow['Group'].', '.$DbRow['Entry'].', '.$DbRow['VersionStart'].', '.$DbRow['VersionEnd'].', '.$Language.', '.$Complete.', '.$User->Id.', '.$SourceText['ID'];
             foreach($Group['Items'] as $GroupItem)
             {
@@ -82 +81 @@
               }
             }
-            $System->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+            $System->Database->query('INSERT INTO `Translation` ('.$Columns.') VALUES ('.$Values.')');
             $LastID = $System->Database->insert_id;
             

branches/CombinedTextTables/statistic.php

@@ -16 +16 @@
   {
     $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-    ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
-    ' WHERE (`Complete` = 1) AND (`Language`='.$LanguageId.') AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+    ' SELECT `T`.* FROM `Translation` AS `T`'.
+    ' WHERE (`Group` = '.$DbRow['Id'].') AND (`Complete` = 1) AND (`Language`='.$LanguageId.') AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
     ') AS `C1`) AS `Translated`, '.
     '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-    ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
-    ' WHERE (`Language` = 0) AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
+    ' SELECT `T`.* FROM `Translation` AS `T`'.
+    ' WHERE (`Group` = '.$DbRow['Id'].') AND (`Language` = 0) AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
     ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';
   }