Changeset 525 for trunk/dictionary.php

Timestamp:

Feb 20, 2013, 11:30:49 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazení porovnání překladů.
• Opraveno: Zobrazení stavu dokončení pro všechny překlady.
• Přidáno: V seznamu překladů přidán sloupec Jazyk.
• Opraveno: Místa, kde s pevným indexem anglického originálu upravena na nastavitelný.

File:

• trunk/dictionary.php (modified) (2 diffs)

trunk/dictionary.php

@@ -58 +58 @@
   }     
 }
-if(array_key_exists('language', $_GET)) $_SESSION['language'] = LoadLanguageIdParameter();
+
+if(array_key_exists('language', $_GET) or ($_SESSION['language'] == 'all'))
+         $_SESSION['language'] = LoadLanguageIdParameter();
 
 $Output = '<h3>Slovníček</h3>';
@@ -180 +182 @@
   //<div style="overflow: auto; width: 100%; height: 100%;">');
 
+  if($_SESSION['language'] == 'all') $LanguageFilter = '';
+    else $LanguageFilter = ' AND (`T2`.`Language` = '.$_SESSION['language'].')';
   if($Search <> '') 
   {
-    $sql = 'SELECT `User`.`Name` AS `UserName`, `User`. `ID` AS `UserID`, `T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` FROM (SELECT `T2`.`User`, `T1`.`Language`, `T1`.`Text` AS `Original`, `T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` ON `T2`.`Entry` = `T1`.`Entry` AND `T2`.`Language` = '.$_SESSION['language'].' WHERE LOWER(`T1`.`Text`) LIKE LOWER("%'.$Search.'%") OR LOWER(`T1`.`Description`) LIKE LOWER("%'.$Search.'%") ) AS `T3` JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = '.$Config['OriginalLanguage'];
-  } else $sql = 'SELECT `User`.`Name` AS `UserName`, `ID` AS `UserID`, `T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` FROM (SELECT `T2`.`User`, `T1`.Language, `T1`.`Text` AS `Original`, `T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` ON `T2`.`Entry` = `T1`.`Entry` AND `T2`.`Language` = '.$_SESSION['language'].') AS `T3` JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = '.$Config['OriginalLanguage'];
+    $sql = 'SELECT `User`.`Name` AS `UserName`, `User`. `ID` AS `UserID`, '.
+      '`T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` '.
+      'FROM (SELECT `T2`.`User`, `T1`.`Language`, `T1`.`Text` AS `Original`, '.
+      '`T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` '.
+      'FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` '.
+      'ON (`T2`.`Entry` = `T1`.`Entry`) '.$LanguageFilter.
+      ' WHERE LOWER(`T1`.`Text`) LIKE LOWER("%'.$Search.'%") OR '.
+      'LOWER(`T1`.`Description`) LIKE LOWER("%'.$Search.'%") ) AS `T3` '.
+      'JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = '.$Config['OriginalLanguage'];
+  } else $sql = 'SELECT `User`.`Name` AS `UserName`, `ID` AS `UserID`, '.
+    '`T3`.`Entry`, `T3`.`Original`, `T3`.`Translated`, `T3`.`Description` FROM '.
+    '(SELECT `T2`.`User`, `T1`.Language, `T1`.`Text` AS `Original`, '.
+    '`T2`.`Text` AS `Translated`, `T2`.`Description`, `T1`.`Entry` AS `Entry` '.
+    'FROM `Dictionary` AS `T1` JOIN `Dictionary` AS `T2` ON '.
+    '(`T2`.`Entry` = `T1`.`Entry`) '.$LanguageFilter.') AS `T3` '.
+    'JOIN `User` ON `User`.`ID` = `T3`.`User` WHERE `T3`.`Language` = '.$Config['OriginalLanguage'];
 
   $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');