Changeset 524 for trunk/dictionary.php

Timestamp:

Feb 20, 2013, 9:40:53 PM (12 years ago)

Author:

chronos

Message:

• Přidáno: Nastavení předvolené verze klienta pro překládání v profilu překladatelů.
• Přidáno: Vlastní text v profilu uživatele.
• Upraveno: Nyní lze veřejně zobrazovat profily překladatelů.
• Opraveno: Na některých místech opraveno použití id originálního jazyka textů.

File:

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

trunk/dictionary.php

@@ -53 +53 @@
   {
     $_SESSION['language'] = $User->Language;
-  } else $_SESSION['language'] = 2;
+  } else   {
+    $LanguageId = reset($LanguageList);
+    $_SESSION['language'] = $LanguageId['Id'];
+  }     
 }
 if(array_key_exists('language', $_GET)) $_SESSION['language'] = LoadLanguageIdParameter();
@@ -95 +98 @@
       'Původní anglické slovo:</td><td><input type="text" name="Original" /></td></tr>'.
       '<tr><td>Přeložené:</td><td><input type="text" name="Translated" /></td></tr>'.
-      '<tr><td>Popis:</td><td><input type="text" name="Description" /></td></tr>'.
+      '<tr><td>Volitelný popis:</td><td><input type="text" name="Description" /></td></tr>'.
       '<tr><td colspan="2"><input type="submit" value="Uložit" /></td></tr>'.
       '</td></tr></table>'.
@@ -105 +108 @@
       if(array_key_exists('Original', $_POST) and array_key_exists('Translated', $_POST) and array_key_exists('Description', $_POST))
       {       
-        $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`=0');
+        $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `Text` = "'.$_POST['Original'].'" AND `Language`= '.$Config['OriginalLanguage']);
         if($DbResult->num_rows > 0)
         {
@@ -115 +118 @@
           $DbRow = $DbResult->fetch_row();
           $Entry = $DbRow[0] + 1;
-          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, 0);');
+          $System->Database->query('INSERT INTO `Dictionary` ( `Text` , `Entry` , `Description` , `User`, `Language` ) VALUES ("'.$_POST['Original'].'", "'.$Entry.'", "", NULL, '.$Config['OriginalLanguage'].');');
         }
       
@@ -137 +140 @@
       $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE `User`='.$User->Id.' AND `Entry`='.$_GET['entry'].' AND `Language`='.$_SESSION['language']);
       $DbRow = $DbResult->fetch_assoc();
-      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE (`User` IS NULL) AND (`Entry`='.$_GET['entry'].') AND (`Language`=0)');
+      $DbResult = $System->Database->query('SELECT * FROM `Dictionary` WHERE (`User` IS NULL) AND (`Entry`='.$_GET['entry'].') AND (`Language`= '.$Config['OriginalLanguage'].')');
       $DbRow2 = $DbResult->fetch_assoc();
       $Output .= '<form action="dictionary.php?action=save" method="post">'.
@@ -169 +172 @@
     if($Language['Enabled'] == 1)
     {
-      if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>';
-      $Output .= ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
-      if($Language['Id'] == $_SESSION['language']) $Output .= '</strong>';
+        $Lang = ' <a href="?language='.$Language['Id'].'">'.$Language['Name'].'</a>';
+      if($Language['Id'] == $_SESSION['language']) $Output .= '<strong>'.$Lang.'</strong> ';
+        else $Output .= $Lang;
     }
   $Output .= '</td></tr>'.
@@ -179 +182 @@
   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` = 0';
-  } 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` = 0';
+    $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'];
 
   $DbResult = $System->Database->query('SELECT COUNT(*) FROM ('.$sql.') AS `T1`');