Changeset 357 for trunk/log.php

Timestamp:

Mar 5, 2010, 7:42:00 AM (14 years ago)

Author:

george

Message:

• Upraveno: Definice typů logovacích záznamů přesunuta do databáze do tabulky LogType. Doplněny konstanty začínající LOG_TYPE_ pro přehlednější používaní v kódu.
• Přidáno: Odkaz a stránka zobrazení všech aktualit.

File:

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

trunk/log.php

@@ -6 +6 @@
 {
   $Items = array();
-  if(array_key_exists('type', $_GET)) $Where = ' WHERE type = "'.($_GET['type'] * 1).'"'; 
+  if(array_key_exists('type', $_GET)) $Where = ' WHERE `type` = "'.($_GET['type'] * 1).'"'; 
     else $Where = '';
-  $sql = 'SELECT *,UNIX_TIMESTAMP(date), (SELECT user.user FROM user WHERE user.id = log.user) as user FROM log'.$Where.' ORDER BY date DESC LIMIT 100';
+  $sql = 'SELECT *,UNIX_TIMESTAMP(`date`), (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log`'.$Where.' ORDER BY `date` DESC LIMIT 100';
   $ID = $Database->SQLCommand($sql);
   while($Line = mysql_fetch_assoc($ID)) 
   {
-    if(array_key_exists($Line['type'], $LogTypes)) $TypeName = $LogTypes[$Line['type']]['Name']; 
-      else $TypeName = '';
+    $DbResult = $Database->SQLCommand('SELECT * FROM `LogType` WHERE `Id`='.$Line['type']);
+    $LogType = mysql_fetch_assoc($DbResult);
+    
     $Items[] = array
     (
-      'Title' => strip_tags($TypeName.': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')'),
+      'Title' => strip_tags($LogType['Name'].': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')'),
       'Link' =>  $Config['Web']['BaseURL'].'log.php',
-      'Description' => $TypeName.': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')',
+      'Description' => $LogType['Name'].': '.$Line['text'].' ('.$Line['user'].', '.$Line['IP'].')',
       'Time' => $Line['UNIX_TIMESTAMP(date)'],
     );
@@ -48 +49 @@
     echo('<strong>Filtr: </strong>');
     echo('<span style="color:black"><a href="log.php?type=" title="Bez filtrování">Všechny</a></span> ');
-    foreach($LogTypes as $Index => $LogItem)
+    $DbResult = $Database->SQLCommand('SELECT * FROM `LogType`');
+    while($LogType = mysql_fetch_assoc($DbResult))
     {
-      echo('<a href="log.php?type='.$Index.'" style="color:'.$LogItem['Color'].'" title="'.$LogItem['Name'].'">'.$LogItem['Name'].'</a> ');
+      echo('<a href="log.php?type='.$LogType['Id'].'" style="color:'.$LogType['Color'].'" title="'.$LogType['Name'].'">'.$LogType['Name'].'</a> ');
     }
   }
@@ -59 +61 @@
   else
   {
-    if(array_key_exists('group', $_SESSION)) $Where = ' WHERE text LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
+    if(array_key_exists('group', $_SESSION)) $Where = ' WHERE `text` LIKE "%'.$TranslationTree[$_SESSION['group']]['Name'].'%"';
       else $Where = '';
   } 
@@ -80 +82 @@
   echo($Order['Output']);
   
-  $sql = 'SELECT *,(SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
+  $sql = 'SELECT *, `LogType`.`Color` AS `LogColor`, (SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` 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:'.$LogTypes[$Line['type']]['Color'].'">'.$Line['text'].'</span></td><td>'.$Line['user'].'</td><td>'.$Line['IP'].'</td></tr>');
+    echo('<tr><td>'.$Line['date'].'</td><td><span style="color: '.$Line['LogColor'].'">'.$Line['text'].'</span></td><td>'.$Line['user'].'</td><td>'.$Line['IP'].'</td></tr>');
   }
   echo('</table>');