Changeset 379 for trunk

Timestamp:

Mar 11, 2010, 5:23:58 PM (15 years ago)

Author:

george

Message:

• Opraveno: Zobrazování sloupce Jméno uživatele ve výpisu záznamů.
• Opraveno: Hledání slovíček ze slovníku souvisejících s překladem.

Location:

trunk

Files:

• dictionary.php (modified) (5 diffs)
• log.php (modified) (2 diffs)

trunk/dictionary.php

@@ -25 +25 @@
   $TablesColumn = array
   (
-    'gameobject' => 'Name',
-    'creature' => 'name',
-    'item' => 'Name',
-    'transports' => 'Name',
-    'areatrigger_teleport' => 'Name',
-    'areatrigger_tavern' => 'Name',
+    'TextGameObject' => 'Name',
+    'TextCreature' => 'name',
+    'TextItem' => 'Name',
+    'TextTransport' => 'Name',
+    'TextAreaTriggerTeleport' => 'Name',
+    'TextAreaTriggerTavern' => 'Name',
   );
  /* $TablesID = array('gameobject' => 5,
@@ -41 +41 @@
   foreach($TablesColumn as $Table => $Column) 
   {  
-    $sql = 'SELECT `ID`,'.$Column.',(SELECT `Name` FROM '.$Table.' AS `T` WHERE `O`.`Entry` = `T`.`Entry` AND `Language` <> 0 LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
+    $sql = 'SELECT `ID`,`'.$Column.'`, (SELECT `Name` FROM `'.$Table.'` AS `T` WHERE `O`.`Entry` = `T`.`Entry` AND `Language` <> 0 LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
     $groupby = ' GROUP BY `'.$Column.'`';
   
@@ -59 +59 @@
 
       if (strlen($ArrStr[$i]) > 4)
-        $where .= 'O.'.$Column.' LIKE "%'.addslashes($ArrStr[$i]).'%" OR ';
+        $where .= '(`O`.`'.$Column.'` LIKE "%'.addslashes($ArrStr[$i]).'%") OR ';
     }
     $where = substr($where,0,strlen($where)-4);
     $where .= ')';
-    echo ('</tr>');
+    echo('</tr>');
 
     $ID = $Database->SQLCommand($sql.$where.$groupby);
@@ -70 +70 @@
       if ($mode == 0) 
       {
-        if (strpos(strtolower($Text),strtolower($Line[$Column])) > 0) 
+        if (strpos(strtolower($Text), strtolower($Line[$Column])) > 0) 
         {
           echo('<tr><td>'.$Line[$Column].'</td>');
-          if ($Line['tran'] <> '') echo('<td>'.$Line['tran'].'</td></tr>');
+          if ($Line['Tran'] <> '') echo('<td>'.$Line['Tran'].'</td></tr>');
           else echo('<td><a target="_NEW2" href="form.php?group='.GetIDbyName($Table).'&amp;ID='.$Line['ID'].'">Překládat</a></td></tr>');
         }
@@ -79 +79 @@
       {
         echo('<tr><td>'.$Line[$Column].'</td>');
-          if ($Line['tran'] <> '') echo('<td>'.$Line['tran'].'</td></tr>');
+          if ($Line['Tran'] <> '') echo('<td>'.$Line['Tran'].'</td></tr>');
           else echo('<td><a target="_NEW2" href="form.php?group='.GetIDbyName($Table).'&amp;ID='.$Line['ID'].'">Překládat</a></td></tr>');
       }

trunk/log.php

@@ -73 +73 @@
   
   $TableColumns = array(
-    array('Name' => 'date', 'Title' => 'Čas'), 
-    array('Name' => 'text', 'Title' => 'Text'), 
-    array('Name' => 'User', 'Title' => 'Uživatel'), 
+    array('Name' => 'Date', 'Title' => 'Čas'), 
+    array('Name' => 'Text', 'Title' => 'Text'), 
+    array('Name' => 'UserName', 'Title' => 'Uživatel'), 
     array('Name' => 'IP', 'Title' => 'Adresa'), 
   );
@@ -82 +82 @@
   echo($Order['Output']);
   
-  $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `User` FROM `Log` LEFT JOIN `LogType` ON `LogType`.`Id`=`Log`.`Type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
+  $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `Log`.`User`) AS `UserName` FROM `Log` LEFT JOIN `LogType` ON `LogType`.`Id`=`Log`.`Type` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
   //echo($sql);
   $ID = $Database->SQLCommand($sql);
   while($Line = mysql_fetch_assoc($ID)) 
   {
-    echo('<tr><td>'.$Line['Date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td><td>'.$Line['Name'].'</td><td>'.$Line['IP'].'</td></tr>');
+    echo('<tr><td>'.$Line['Date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td><td>'.$Line['UserName'].'</td><td>'.$Line['IP'].'</td></tr>');
   }
   echo('</table>');