Changeset 58 for trunk

Timestamp:

Feb 3, 2009, 8:26:12 AM (16 years ago)

Author:

george

Message:

• Opraveno: Chyba řazení seznamu překladů s odlišnými názvy textových sloupců pro různé skupiny překladu. Různý název sloupce způsoboval chybu v ORDER BY.

Location:

trunk

Files:

• TranslationList.php (modified) (5 diffs)
• includes/databaseconection.php (modified) (1 diff)

trunk/TranslationList.php

@@ -67 +67 @@
   global $Database, $order, $desc, $TranslationTree, $GroupId, $Table;
  
+  // Check if order column exists
+  $Items = $TranslationTree[$GroupId]['Items'];
+  $I = 0;
+  while(($I < count($Items)) and ($Items[$I]['MangosColumn'] != $order)) $I++;
+  if($I >= count($Items)) $order = 'ID';       
+
   if($limit <> '') $limit = 'LIMIT '.$limit;
 
@@ -78 +84 @@
     $desc = '';
   }
-        
+  
   echo('<table border="1" cellpadding="2" cellspacing="0"><tr>
     <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=ID&amp;desc='.$desc.'">Pořadové číslo</a></th>
     <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=entry&amp;desc='.$desc.'">Identifikační číslo</a></th>
-    <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=Title&amp;desc='.$desc.'">Název</a></th>');
+    <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order='.$TranslationTree[$GroupId]['Items'][0]['Column'].'&amp;desc='.$desc.'">Název</a></th>');
   if ($address == 'selection') echo('<th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=CountQuests&amp;desc='.$desc.'">Výskyt</a></th>'); 
   else if($address <> 'notran') echo('<th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=user&amp;desc='.$desc.'">Uživatel</a></th>
@@ -112 +118 @@
         <strong>Vypsání nepřeložených textů s limitem na stránku</strong><br /><br />');
 
-  WritePages('?group='.$GroupId.'&amp;action=notran', 'items WHERE items.Language = 0 AND
-    NOT EXISTS(SELECT 1 FROM '.$Table.' sub WHERE sub.Language <> 0 AND sub.entry = items.entry)');
-
-  WriteQuests('SELECT * FROM '.$Table.' items WHERE items.Language = 0 AND
-    NOT EXISTS(SELECT 1 FROM '.$Table.' sub WHERE sub.Language <> 0 AND sub.entry = items.entry) ', $_SESSION['limitx'].','.$_SESSION['limity'], 'notran');
+  WritePages('?group='.$GroupId.'&amp;action=notran', 'AS items WHERE items.Language = 0 AND
+    NOT EXISTS(SELECT 1 FROM '.$Table.' AS sub WHERE sub.Language <> 0 AND sub.entry = items.entry)');
+
+  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)) ', $_SESSION['limitx'].','.$_SESSION['limity'], 'notran');
 } 
 
@@ -151 +157 @@
 
   WriteQuests('SELECT *, (SELECT user.user FROM user WHERE user.id = '.$Table.'.user) as User
-    FROM '.$Table.' WHERE Language <> 0 AND '.$Table.'.Complete = 1 AND admin_check = 1', $_SESSION['limitx'].','.$_SESSION['limity'], 'admin_check');
+    FROM '.$Table.' WHERE (Language <> 0) AND ('.$Table.'.Complete = 1) AND (admin_check = 1)', $_SESSION['limitx'].','.$_SESSION['limity'], 'admin_check');
 } 
 
@@ -162 +168 @@
 
   WriteQuests('SELECT *, (SELECT user.user FROM user WHERE user.id = '.$Table.'.user) as User
-    FROM '.$Table.'  WHERE Language <> 0 AND '.$Table.'.Complete = 1 AND admin_check <> 1', $_SESSION['limitx'].','.$_SESSION['limity'], 'admin_nocheck');
+    FROM '.$Table.'  WHERE (Language <> 0) AND ('.$Table.'.Complete = 1) AND (admin_check <> 1)', $_SESSION['limitx'].','.$_SESSION['limity'], 'admin_nocheck');
 } 
 

trunk/includes/databaseconection.php

@@ -24 +24 @@
         
     $ReturnCommand = mysql_query($Command, $this->id_connection);
-        if((mysql_error() != '') and ($Config['Web']['ShowSQLErrors'] = true)) 
+        if((mysql_error() != '') and ($Config['Web']['ShowSQLError'] == true)) 
           echo('<div>'.mysql_error().'<br>'.$Command.'</div>');
     return($ReturnCommand);