Changeset 808 for trunk

Timestamp:

May 25, 2014, 12:18:55 PM (11 years ago)

Author:

chronos

Message:

• Modified: Do not show Type column in Log table in administration if some type is selected. Currently selected type is highlighted as strong link text in filter line.

Location:

trunk

Files:

• Modules/Log/Log.php (modified) (4 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Log/Log.php

@@ -130 +130 @@
     if(array_key_exists('group', $_GET)) $_SESSION['group'] = $_GET['group'];
 
-    if($_SESSION['type'] != '') $WhereType = ' `Type`='.$_SESSION['type']; 
+    if($_SESSION['type'] != '') $WhereType = ' (`Type`='.$_SESSION['type'].')'; 
       else $WhereType = '1=1';
     
@@ -137 +137 @@
     );
   
+    // Show category filter
     if($this->System->User->Licence(LICENCE_MODERATOR))
     {
-      $Output = '<strong>Filtr: </strong>'.
-        '<span style="color:black"><a href="log.php?type=" title="Bez filtrování">Všechny</a></span> ';
+      $Output = '<strong>Filtr:</strong>';
+        $Item = '<a href="log.php?type=" title="Bez filtrování">Všechny</a>';
+      if($_SESSION['type'] == '') $Item = '<strong>'.$Item.'</strong>';
+      $Output .= ' '.$Item;
       $DbResult = $this->System->Database->query('SELECT * FROM `LogType`');
       while($LogType = $DbResult->fetch_assoc())
       {
-        $Output .= '<a href="log.php?type='.$LogType['Id'].'" style="color:'.$LogType['Color'].'" title="'.$LogType['Name'].'">'.$LogType['Name'].'</a> ';
+        $Item = '<a href="log.php?type='.$LogType['Id'].'" style="color:'.$LogType['Color'].'" title="'.$LogType['Name'].'">'.$LogType['Name'].'</a>';
+        if($_SESSION['type'] == $LogType['Id']) $Item = '<strong>'.$Item.'</strong>';
+        $Output .= ' '.$Item;
       }
       // echo ' Formát: datum: text zprávy (uživatel, IP)<br /><br />';
@@ -164 +169 @@
   
     $TableColumns = array(
-      array('Name' => 'Date', 'Title' => 'Čas'), 
-      array('Name' => 'LogName', 'Title' => 'Typ'), 
+      array('Name' => 'Date', 'Title' => 'Čas'),
+    );
+    if($_SESSION['type'] == '') $TableColumns[] = 
+      array('Name' => 'LogName', 'Title' => 'Typ');
+    $TableColumns = array_merge($TableColumns, array( 
           array('Name' => 'Text', 'Title' => 'Text'), 
       array('Name' => 'UserName', 'Title' => 'Uživatel'), 
       array('Name' => 'IP', 'Title' => 'Adresa'), 
       array('Name' => 'URL', 'Title' => 'URL'),
-    );
+    ));
     $Order = GetOrderTableHeader($TableColumns, 'date', 1);
     $Output .= '<table width="98%" class="BaseTable">'.
@@ -182 +190 @@
           if($Line['Type'] == LOG_TYPE_ERROR) $Line['Text'] = htmlspecialchars($Line['Text']);
       $Line['Text'] = str_replace("\n", '<br>', $Line['Text']);
-          $Output .= '<tr><td>'.$Line['Date'].'</td>'.
-      '<td>'.$Line['LogName'].'</td>'.
-      '<td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td>'.
+          $Output .= '<tr><td>'.$Line['Date'].'</td>';
+          if($_SESSION['type'] == '') $Output .= '<td>'.$Line['LogName'].'</td>';
+      $Output .= '<td><span style="color: '.$Line['LogColor'].'">'.$Line['Text'].'</span></td>'.
       '<td><a href="'.$this->System->Link('/user.php?user='.$Line['User']).'">'.$Line['UserName'].'</a></td>'.
       '<td>'.$Line['IP'].'</td>'.

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 807; // Subversion revision
+$Revision = 808; // Subversion revision
 $DatabaseRevision = 803; // Database structure revision
-$ReleaseTime = '2014-05-24';
+$ReleaseTime = '2014-05-25';