Changeset 199 for trunk/dictionary.php

Timestamp:

Jun 5, 2009, 7:08:55 PM (16 years ago)

Author:

george

Message:

• Přidáno: Zapomenutí SQL aktualizace k minulému commitu.
• Opraveno: Zvýraznění aktuální stránky v seznamu čísel stránek.
• Opraveno: Správné zobrazení položek na stránky ve slovníčku.

File:

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

trunk/dictionary.php

@@ -211 +211 @@
     }
   echo('</td></tr>');
-  echo('<tr><td>
-  <div style="overflow: auto; width: 100%; height: 100%;">');
+  echo('<tr><td>');
+  //<div style="overflow: auto; width: 100%; height: 100%;">');
 
   if($Search <> '') 
@@ -218 +218 @@
     $sql = 'SELECT `user`.`user` 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`.`user` 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 .= ' LIMIT '.($_SESSION['Page'] - 1) * $Config['Web']['ItemsPerPage'].','.$Config['Web']['ItemsPerPage'];
+  $sql_page = $sql.' LIMIT '.($_SESSION['Page'] - 1) * $Config['Web']['ItemsPerPage'].','.$Config['Web']['ItemsPerPage'];
 
   ListPaging('?Page=', '('.$sql.') AS T1', '', $Config['Web']['ItemsPerPage'], $_SESSION['Page']);
@@ -227 +227 @@
     if(Licence(LICENCE_USER)) echo('<th>Akce</th>');
     echo('</tr>');
-  $ID = $Database->SQLCommand($sql);
+  $ID = $Database->SQLCommand($sql_page);
   while ($Line = mysql_fetch_assoc($ID)) 
   {
@@ -245 +245 @@
   echo('</table>');  
   ListPaging('?Page=', '('.$sql.') AS T1', '', $Config['Web']['ItemsPerPage'], $_SESSION['Page']);
-  echo('</div></td></tr>'); 
+  echo('</td></tr>'); 
   echo('</table></form>');
 }