Changeset 906

Timestamp:

09/23/07 03:51:17 (14 months ago)

Author:

smerrill

Message:

* trying out iconv functions in Utils::truncate(), per issue 430. Please report issues on that ticket, in order to centralize any discussion.

* first stab at filtering log entries. Filtering by "type" does not work; nor does deleting log entries (that bit still needs to be wired up). Please report issues to -dev for discussion.

* fixing a problem with the dashboard's display of total number of posts.

Location:

trunk/htdocs/system

Files:

• admin/dashboard.php (modified) (1 diff)
• admin/logs.php (modified) (1 diff)
• classes/adminhandler.php (modified) (1 diff)
• classes/eventlog.php (modified) (2 diffs)
• classes/logentry.php (modified) (5 diffs)
• classes/utils.php (modified) (2 diffs)

trunk/htdocs/system/admin/dashboard.php

@@ -81 +81 @@
       <h3><?php _e( 'Site Statistics' ); ?></h3>
       <table id="site-stats" width="100%" cellspacing="0">
-        <tr><td><?php _e( 'Total Posts' ); ?></td><td><?php echo Posts::count_total( Post::status( 'all' ) ); ?></td></tr>
+        <tr><td><?php _e( 'Total Posts' ); ?></td><td><?php echo Posts::count_total( Post::status( 'any' ) ); ?></td></tr>
         <tr><td><?php _e( 'Number of Your Posts' ); ?></td><td><?php echo Posts::count_by_author( User::identify()->id, Post::status( 'all' ) ); ?></td></tr>
         <tr><td><?php _e( 'Number of Comments' ); ?></td><td><?php echo Comments::count_total(); ?></td></tr>

trunk/htdocs/system/admin/logs.php

@@ -8 +8 @@
     </div>
     <div class="dashboard-block c3" id="log-activity">
+    <form method="post" action="<?php URL::out('admin', 'page=logs'); ?>" class="buttonform">
+    <p>Search log entries: 
+    <input type="textbox" size="50" name='search' value="<?php echo $search; ?>"> <input type="submit" name="do_search" value="<?php _e('Search'); ?>">
+    <?php printf( _t('Limit: %s'), Utils::html_select('limit', $limits, $limit)); ?>
+    <?php printf( _t('Page: %s'), Utils::html_select('index', $pages, $index)); ?>
+    <a href="<?php URL::out('admin', 'page=logs'); ?>">Reset</a>
+    </p>
         <table id="log-activity-table" width="100%" cellspacing="0">
             <thead>
                 <tr>
+                    <th></th>
                     <th align="left">Date</th>
                     <th align="left">User</th>
                     <th align="left">Type</th>
+                    <th align="center">Severity</th>
                     <th align="left">Message</th>
-                    <th align="center">Severity</th>
                 </tr>
             </thead>
-            <?php foreach( eventlog::get( array( 'nolimit' => true ) ) as $log ){ ?>
             <tr>
+            <td></td>
+            <td><?php echo Utils::html_select('date', $dates, $date); ?></td>
+            <td><?php echo Utils::html_select('user', $users, $user); ?></td>
+            <td><?php echo Utils::html_select('type', $types, $type); ?></td>
+            <td><?php echo Utils::html_select('severity', $severities, $severity); ?></td>
+            <td align="right"><input type="submit" name="filter" value="<?php _e('Filter'); ?>"></td>
+            </tr>
+            <?php foreach( $logs as $log ){ ?>
+            <tr>
+                <td align="center"><input type="checkbox" name="log_ids[]" value="<?php echo $log->id; ?>"></td>
                 <td><?php echo $log->timestamp; ?></td>
                 <td><?php if ( $log->user_id ) { $user= User::get_by_id( $log->user_id ); echo $user->username; } ?></td>
                 <td><?php echo $log->type; ?></td>
+                <td><?php echo $log->severity; ?></td>
                 <td><p><?php echo $log->message; ?></p></td>
-                <td><?php echo $log->severity; ?></td>
             </tr>
             <?php } ?>
+            <tr><td colspan="6">
+            <input type="hidden" name="nonce" value="<?php echo $wsse['nonce']; ?>">
+             <input type="hidden" name="timestamp" value="<?php echo $wsse['timestamp']; ?>">
+             <input type="hidden" name="PasswordDigest" value="<?php echo $wsse['digest']; ?>">
+             <input type="submit" name="do_delete" value="<?php _e('Delete'); ?>">
         </table>
     </div>

trunk/htdocs/system/classes/adminhandler.php

@@ -542 +542 @@
     }
     
+    public function get_logs()
+    {
+        $this->post_logs();
+    }
+
+    public function post_logs()
+    {
+        $locals= array(
+            'do_update' => false,
+            'log_ids' => null,
+            'nonce' => '',
+            'timestamp' => '',
+            'PasswordDigest' => '',
+            'change' => '',
+            'limit' => 20,
+            'user' => 0,
+            'date' => 'any',
+            'type' => 'any',
+            'severity' => 'any',
+            'search' => '',
+            'do_search' => false,
+            'index' => 1,
+        );
+        foreach ( $locals as $varname => $default ) {
+            $$varname= isset($this->handler_vars[$varname]) ? $this->handler_vars[$varname] : $default;
+            $this->theme->{$varname}= $$varname;
+        }
+        $this->theme->severities= LogEntry::list_severities();
+        $types= array( 0 => 'Any');
+        $this->theme->types= array_merge( $types, LogEntry::list_types() );
+
+        // set up the users
+        $users_temp= DB::get_results( 'SELECT username, user_id FROM ' . DB::table('users') . ' JOIN ' . DB::table('log') . ' ON ' . DB::table('users') . '.id=' . DB::table('log') . '.user_id GROUP BY user_id ORDER BY username ASC');
+        array_unshift( $users_temp, new QueryRecord(array('username' => 'All', 'user_id' => 0)));
+        foreach ($users_temp as $user) {
+            $users[$user->user_id]= $user->username;
+        }
+        $this->theme->users= $users;
+        
+        // set up dates.
+        $dates= DB::get_column("SELECT DATE_FORMAT(timestamp, '%Y-%m') FROM " . DB::table('log') . ' ORDER BY timestamp DESC');
+        array_unshift( $dates, 'Any');
+        $dates= array_combine( $dates, $dates );
+        $this->theme->dates= $dates;
+
+        // set up the limit select box
+        $limits= array( 5, 10, 20, 50, 100 );
+        $limits= array_combine( $limits, $limits );
+        $this->theme->limits= $limits;
+
+        // prepare the WSSE tokens
+        $this->theme->wsse= Utils::WSSE();
+
+        $arguments= array(
+            'type' => $type,
+            'severity' => LogEntry::severity($severity),
+            'limit' => $limit,
+            'offset' => ( $index - 1) * $limit,
+        );
+        if ( 'any' != strtolower($date) ) {
+            list($arguments['year'], $arguments['month'])= explode( '-', $date );
+        }
+        if ( '' != $search ) {
+            $arguments['criteria']= $search;
+        }
+        $this->theme->logs= EventLog::get( $arguments );
+
+        // get the page count
+        $arguments['count']= 'id';
+        unset($arguments['limit']);
+        unset($arguments['offset']);
+        $totalpages= EventLog::get( $arguments );
+        $pagecount= ceil( $totalpages / $limit );
+
+        // put the page numbers into an array
+        $pages= array();
+        for ( $z= 1; $z <= $pagecount; $z++ ) {
+            $pages[$z]= $z;
+        }
+        $this->theme->pagecount= $pagecount;
+        $this->theme->pages= $pages;
+
+        $this->display( 'logs' );
+    }
+
     /**
      * Assembles the main menu for the admin area.

trunk/htdocs/system/classes/eventlog.php

@@ -54 +54 @@
         DB::query( 'DELETE FROM ' . DB::Table('log_types') . ' WHERE module = ? AND type = ?', array( self::get_module($module), $type ) );
     }
-    
+
     /**
      * Write an entry to the event log.
@@ -162 +162 @@
                     $params[]= $paramset['user_id'];
                 }
-                if ( isset( $paramset['severity'] ) ) {
-                    $where[]= "severity= ?";
-                    $params[]= $paramset['severity'];
+                if ( isset( $paramset['severity'] ) && ( 'any' != LogEntry::severity_name($paramset['severity']) ) ) {
+                    $where[]= "severity_id= ?";
+                    $params[]= LogEntry::severity($paramset['severity']);
                 }
                 if ( isset( $paramset['type_id'] ) ) {
                     $where[]= "type_id= ?";
                     $params[]= $paramset['type_id'];
+                }
+
+                /* do searching */
+                if ( isset( $paramset['criteria'] ) ) {
+                    preg_match_all( '/(?<=")(\\w[^"]*)(?=")|(\\w+)/', $paramset['criteria'], $matches );
+                    foreach ( $matches[0] as $word ) {
+                        $where[] .= "(message LIKE CONCAT('%',?,'%'))";
+                        $params[] = $word;
+                    }
                 }
                 

trunk/htdocs/system/classes/logentry.php

@@ -17 +17 @@
      */
     private static $severities= array(
+        'any',
         'none', // should not be used
         'debug', 'info', 'notice', 'warning', 'err', 'crit', 'alert', 'emerg',
@@ -70 +71 @@
     
     /**
-     * Returns an associative array of post types
+     * Returns an associative array of LogEntry types
      *
      * @param bool whether to force a refresh of the cached values
@@ -85 +86 @@
         }
         return self::$types;
-    }       
+    }
+
+    /**
+     * Return an array of Severities
+     * @return array An array of severity ID => name pairs
+    **/
+    public static function list_severities()
+    {
+        foreach ( self::$severities as $id => $name ) {
+            if ( 'none' == $name ) {
+                continue;
+            }
+            $results[$id]= $name;
+        }
+        return $results;
+    }
+
+    /**
+     * Returns an array of LogEntry modules
+     * @param bool Whether to refresh the cached values
+     * @return array An array of LogEntry module id => name pairs
+    **/
+    public static function list_modules( $refresh= false )
+    {
+        $types= self::list_logentry_types( $refresh );
+        foreach ($types as $module => $types) {
+            $modules[]= $module;
+        }
+    }
+
+    /**
+     * Returns an array of LogEntry types
+     * @param bool Whether to refresh the cached values
+     * @return array An array of LogEntry id => name pairs
+    **/
+    public static function list_types( $refresh= false )
+    {
+        $types= array();
+        $matrix= self::list_logentry_types( $refresh );
+        foreach ($matrix as $module => $module_types) {
+            $types= array_merge($types, $module_types);
+        }
+        return array_flip($types);
+    }
     
     /**
@@ -102 +146 @@
     
     /**
-     * Get the string representation of teh severity numeric value.
+     * Get the string representation of the severity numeric value.
      *
      * @param integer $severity The severity index.
@@ -251 +295 @@
     
     /**
-     * Overrides QueryRecord __get to implement custom object properties
+     * Overrides QueryRecord __set to implement custom object properties
      *
      * @param string Name of property to return

trunk/htdocs/system/classes/utils.php

@@ -690 +690 @@
             }
             // if the string is less than the length specified, bail out
-            if ( strlen($str) <= $len ) {
+            if ( iconv_strlen($str) <= $len ) {
                     return $str;
             }
@@ -699 +699 @@
                     $len = round(($len-3)/2);
                     // and place an ellipse in between the pieces
-                    return substr($str, 0, $len) . '...' . substr($str, -$len);
+                    return iconv_substr($str, 0, $len) . '...' . substr($str, -$len);
             } else {
                     // no, the ellipse goes at the end
                     $len= $len-3;
-                    return substr($str, 0, $len ) . '...';
+                    return iconv_substr($str, 0, $len ) . '...';
             }
     }