Changeset 431 for trunk

Timestamp:

Apr 8, 2010, 8:49:29 PM (14 years ago)

Author:

george

Message:

• Opraveno: Zobrazovat v nabídce ostatních variant překladů jen dokončené a nezobrazovat vlastní překlad.

Location:

trunk

Files:

• TranslationList.php (modified) (1 diff)
• form.php (modified) (2 diffs)

trunk/TranslationList.php

@@ -263 +263 @@
 function SearchEntry()
 {
-  global $Table;
+  global $Table, $System;
   
   if(array_key_exists('ID', $_GET) and is_numeric($_GET['ID'])) $Search = $_GET['ID'];
   else if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID'])) $Search = $_POST['ID'];
-  else $Search = '';
- 
-  $sql = 'SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` LIKE "'.$Search.'")'.
-  ' AND ((`Language` = 0) OR ((`Complete` = 1) AND (`Language` != 0)))'; // Do not show uncompleted user translation
+  else ErrorMessage('Nebylo zadáno ID položky');
+  
+  $DbResult = $System->Database->query('SELECT `Entry` FROM `'.$Table.'` WHERE `ID`='.$Search);
+  if($DbResult->num_rows > 0)
+  { 
+    $DbRow = $DbResult->fetch_assoc();
+    $sql = 'SELECT *, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$DbRow['Entry'].')'.
+  ' AND (`Complete` = 1) AND (`Language` != 0) AND (`ID` != '.$Search.')'; // Do not show uncompleted user translation
     
-  WriteQuests($sql);
+    WriteQuests($sql);
+  } else echo('Položka nenalezena');
 }
 

trunk/form.php

@@ -63 +63 @@
   echo('<br />');
    
-  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE `Entry` = '.$Line['Entry'].' AND `Language` <> 0');
+  $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`Language` <> 0) AND (`Complete` = 1) AND (`ID` <> '.$Line['ID'].')');
   $Version = mysql_fetch_row($DbResult);
   $Version = $Version[0];
   if($Version > 0)
   {
-    echo('<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['Entry'].'">Počet verzí: <strong>'.$Version.'</strong></a>  
+    echo('<form action="comparison.php" method="get"><a href="TranslationList.php?group='.$GroupId.'&amp;action=searchentry&amp;ID='.$Line['ID'].'">Počet verzí: <strong>'.$Version.'</strong></a>  
       <input type="hidden" name="group" value="'.$GroupId.'" />
       <input type="hidden" name="entry" value="'.$Line['Entry'].'" />
@@ -75 +75 @@
       <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` = `'.$Table.'`.`User`) AS `UserName` FROM `'.$Table.'` WHERE (`Entry` = '.$Line['Entry'].') AND (`ID` <> '.$Line['ID'].') AND (`Complete` = 1)');  
     while($version = mysql_fetch_array($DataID))
     {