Changeset 1720

Timestamp:

05/16/08 00:10:49 (7 months ago)

Author:

ringmaster

Message:

Adding searches on admin manage posts and comments pages. Fixes #335. Thanks, bjohnson.

Location:

trunk/htdocs/system

Files:

• admin/comments.php (modified) (2 diffs)
• admin/entries.php (modified) (1 diff)
• classes/adminhandler.php (modified) (6 diffs)
• classes/comments.php (modified) (1 diff)
• classes/posts.php (modified) (1 diff)

trunk/htdocs/system/admin/comments.php

@@ -4 +4 @@
     <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; Older</a></span>
     <span class="currentposition pct15 minor">0-0 of 0</span>
-    <span class="search pct50"><input type="search" placeholder="Type and wait to search for any entry component" autosave="habaricontent" results="10"></span>
+    <span class="search pct50"><input type="search" placeholder="Type and wait to search for any entry component" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span>
     <span class="nothing pct15">&nbsp;</span>
     <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false">Newer &raquo;</a></span>
@@ -31 +31 @@
     <input type="hidden" name="search" value="<?php echo $search; ?>">
     <input type="hidden" name="limit" value="<?php echo $limit; ?>">
-    <input type="hidden" name="index" value="<?php echo $index; ?>">
     <input type="hidden" name="search_status" value="<?php echo $search_status; ?>">
     <input type="hidden" id="nonce" name="nonce" value="<?php echo $wsse['nonce']; ?>">

trunk/htdocs/system/admin/entries.php

@@ -5 +5 @@
     <span class="older pct10"><a href="#" onclick="timeline.skipLoupeLeft();return false">&laquo; Older</a></span>
     <span class="currentposition pct15 minor">0-0 of 0</span>
-    <span class="search pct50"><input type="search" placeholder="Type and wait to search for any entry component" autosave="habaricontent" results="10"></span>
+    <span class="search pct50"><input type="search" placeholder="Type and wait to search for any entry component" autosave="habaricontent" results="10" value="<?php echo $search_args ?>"></span>
     <span class="nothing pct15">&nbsp;</span>
     <span class="newer pct10"><a href="#" onclick="timeline.skipLoupeRight();return false">Newer &raquo;</a></span>

trunk/htdocs/system/classes/adminhandler.php

@@ -589 +589 @@
             'mass_spam_delete' => null,
             'mass_delete' => null,
-
-            'type' => Comment::type( 'comment' ),
-            'status' => Comment::status( 'approved' ),
-            'limit' => 30,
-            'orderby' => 'date DESC',
-            'default_radio' => array( 'approve'=>'', 'delete'=>'', 'spam'=>'', 'unapprove'=>'', 'edit' =>'' ),
-            'show' => '0',
+            'type' => 'All',
+            'limit' => 20,
+            'offset' => 0,
             'search' => '',
-            'search_fields' => array( 'content' ),
-            'search_status' => 1,
-            'search_type' => null,
-            'do_search' => false,
-            'index' => 1,
-            'offset' => 0,
+            'search_status' => 'All',
         );
         foreach ( $locals as $varname => $default ) {
@@ -725 +716 @@
         }
 
-        // Set up the limits select box
-        $limits= array( 5, 10, 20, 50, 100 );
-        $limits= array_combine( $limits, $limits );
-        $this->theme->limits= $limits;
-
-        // Set up the type select box
-        $types_tmp= Comment::list_comment_types();
-        $types['All']= 'All';
-        foreach ( $types_tmp as $type_key => $type_val  ) {
-            $types[$type_key]= $type_val;
-        }
-        $this->theme->types= $types;
-
-        // Set up the status select box
-        $statuses_tmp= Comment::list_comment_statuses();
-        $statuses['All']= 'All';
-        foreach ( $statuses_tmp as $status_key => $status_val  ) {
-            $statuses[$status_key]= $status_val;
-        }
-        $this->theme->statuses= $statuses;
-
         // we load the WSSE tokens
         // for use in the delete button
@@ -751 +721 @@
 
         $arguments= array(
+            'type' => $type,
+            'status' => $search_status,
             'limit' => $limit,
-            'offset' => isset($offset) ? $offset : 0,
+            'offset' => $offset,
         );
 
-        // Decide what to display
-        $arguments['status']= intval( $search_status );
-        switch ( $search_status ) {
-            case 'All':
-                $this->theme->mass_delete= '';
-                unset( $arguments['status'] );
-                break;
-            case Comment::STATUS_SPAM:
-                $this->theme->mass_delete= 'mass_spam_delete';
-                $default_radio['spam']= ' checked';
-                break;
-            case Comment::STATUS_APPROVED:
-                $this->theme->mass_delete= '';
-                $default_radio['approve']= ' checked';
-                break;
-            case Comment::STATUS_UNAPPROVED:
-                $this->theme->mass_delete= 'mass_delete';
-                $default_radio['unapprove']= ' checked';
-                break;
-            default:
-                $this->theme->mass_delete= '';
-                break;
-        }
-        $this->theme->default_radio= $default_radio;
-
-        if($search_type != 'All') {
-            $arguments['type']= intval( $search_type );
+        // there is no explicit 'all' type/status for comments, so we need to unset these arguments
+        // if that's what we want. At the same time we can set up the search field
+        $this->theme->search_args= '';
+        if ( $type == 'All') { 
+            unset( $arguments['type'] );
+        }
+        else {
+            $this->theme->search_args= 'type:' . Comment::type_name( $type ) . ' ';
+        }
+        if ( $search_status == 'All') {
+            unset ( $arguments['status'] );
+        }
+        else {
+            $this->theme->search_args.= 'status:' . Comment::status_name( $search_status );
         }
 
         if ( '' != $search ) {
-            $arguments['criteria']= $search;
-            $arguments['criteria_fields']= $search_fields;
-        }
-
-        if ( $search_type == 'All' ) {
-            unset( $arguments['type'] );
-        }
+            $arguments= array_merge( $arguments, Comments::search_to_get( $search ) );
+        }
+
         $this->theme->comments= Comments::get( $arguments );
 
-        // Get the page count
-        $arguments['count']= 'id';
-        unset( $arguments['limit'] );
-        unset( $arguments['offset'] );
-        $totalpages= Comments::get( $arguments );
-        $pagecount= ceil( $totalpages / $limit );
-
-        // Put page numbers into an array for the page controls to output.
-        $pages= array();
-        for ( $z= 1; $z <= $pagecount; $z++ ) {
-            $pages[$z]= $z;
-        }
-        $this->theme->pagecount= $pagecount;
-        $this->theme->pages= $pages;
         $this->theme->monthcomments= DB::get_results( 'SELECT MONTH(date) AS month, YEAR(date) AS year, COUNT(id) AS ct FROM {comments} GROUP BY year, month ORDER BY year, month', array() );
     }
@@ -888 +829 @@
             'PasswordDigest' => '',
             'change' => '',
-
             'author' => 0,
             'type' => Post::type( 'entry' ),
-            'status' => Post::status( 'published' ),
+            'status' => Post::status( 'any' ),
             'limit' => 20,
             'offset' => 0,
-            'year_month' => 'Any',
             'search' => '',
-            'do_search' => false,
-            'index' => 1,
         );
         foreach ( $locals as $varname => $default ) {
@@ -947 +884 @@
         }
 
-        // Set up Authors select box
-        $authors_temp= DB::get_results( 'SELECT DISTINCT username, user_id FROM {users} JOIN {posts} ON {users}.id = {posts}.user_id ORDER BY username ASC' );
-        array_unshift( $authors_temp, new QueryRecord( array( 'username' => 'All', 'user_id' => 0 ) ) );
-        $authors= array();
-        foreach ( $authors_temp as $author ) {
-            $authors[$author->user_id]= $author->username;
-        }
-        $this->theme->authors= $authors;
-
-        // Set up the dates select box
-        $dates= DB::get_column( "SELECT pubdate FROM " . DB::table( 'posts' ) . ' ORDER BY pubdate DESC' );
-        $dates= array_map( create_function( '$date', 'return strftime( "%Y-%m", strtotime( $date ) );' ), $dates );
-        array_unshift( $dates, 'Any' );
-        $dates= array_combine( $dates, $dates );
-        $this->theme->dates= $dates;
-
-        // Set up the limits select box
-        $limits= array( 5, 10, 20, 50, 100 );
-        $limits= array_combine( $limits, $limits );
-        $this->theme->limits= $limits;
-
         // we load the WSSE tokens
         // for use in the delete button
@@ -978 +894 @@
             'offset' => $offset,
         );
-        if ( 'any' != strtolower( $year_month ) ) {
-            list( $arguments['year'], $arguments['month'] )= explode( '-', $year_month );
-        }
+
         if ( '' != $search ) {
-            $arguments['criteria']= $search;
+            $arguments= array_merge( $arguments, Posts::search_to_get( $search ) );
         }
         $this->theme->posts= Posts::get( $arguments );
 
-        // Get the page count
-        $arguments['count']= 'id';
-        unset( $arguments['limit'] );
-        unset( $arguments['offset'] );
-        $totalpages= Posts::get( $arguments );
-        $pagecount= ceil( $totalpages / $limit );
-
-        // Put page numbers into an array for the page controls to output.
-        $pages= array();
-        for ( $z= 1; $z <= $pagecount; $z++ ) {
-            $pages[$z]= $z;
-        }
-        $this->theme->pagecount= $pagecount;
-        $this->theme->pages= $pages;
+        // setup keyword in search field if a status or type was passed in POST
+        $this->theme->search_args= '';
+        if ( $status != Post::status( 'any' ) ) {
+            $this->theme->search_args= 'status:' . Post::status_name( $status ) . ' ';
+        }
+        if ( $type != Post::type( 'any' ) ) {
+            $this->theme->search_args.= 'type:' . Post::type_name( $type );
+        }
+
         $this->theme->monthposts= DB::get_results( 'SELECT MONTH(pubdate) AS month, YEAR(pubdate) AS year, COUNT(id) AS ct FROM {posts} WHERE content_type = ? GROUP BY year, month ORDER BY year, month', array( $type ) );
     }

trunk/htdocs/system/classes/comments.php

@@ -574 +574 @@
         DB::query( 'DELETE FROM {commentinfo} WHERE comment_id NOT IN ( SELECT id FROM {comments} )' );
     }
+
+    /**
+     * Parses a search string for status, type, author, and tag keywords. Returns
+     * an associative array which can be passed to Comments::get(). If multiple
+     * authors, statuses, or types are specified, we assume an implicit OR
+     * such that (e.g.) any author that matches would be returned.
+     *
+     * @param string $search_string The search string
+     * @return array An associative array which can be passed to Comments::get()
+     */
+    public static function search_to_get( $search_string ) {
+        $keywords= array('author' => 1, 'status' => 1, 'type' => 1 );
+        // Comments::list_comment_statuses and list_comment_types return associative arrays with key/values
+        // in the opposite order of the equivalent functions in Posts. Maybe we should change this?
+        // In any case, we need to flip them for our purposes
+        $statuses= array_flip( Comment::list_comment_statuses() );
+        $types= array_flip( Comment::list_comment_types() );
+        $arguments= array(
+                        'name' => array(),
+                        'status' => array(),
+                        'type' => array()
+                        );
+        $criteria= '';
+        
+        $tokens= explode( ' ', $search_string );
+        
+        foreach( $tokens as $token ) {
+            // check for a keyword:value pair
+            if ( preg_match( '/^\w+:\S+$/', $token ) ) {
+                list( $keyword, $value )= explode( ':', $token );
+
+                $keyword= strtolower( $keyword );
+                switch ( $keyword ) {
+                    case 'author':
+                        $arguments['name'][]= $value;
+                        break;
+                    case 'status':
+                        if ( isset( $statuses[ucfirst( $value )] ) ) {
+                            $arguments['status'][]= (int) $statuses[ucfirst( $value )];
+                        }
+                        break;
+                    case 'type':
+                        if ( isset( $types[ucfirst( $value )] ) ) {
+                            $arguments['type'][]= (int) $types[ucfirst( $value )];
+                        }
+                        break;
+                }
+            }
+            else {
+                $criteria .= $token . ' ';
+            }
+        }
+        // flatten keys that have single-element or no-element arrays
+        foreach ( $arguments as $key => $arg ) {
+            switch ( count( $arg ) ) {
+                case 0:
+                    unset( $arguments[$key] );
+                    break;
+                case 1:
+                    $arguments[$key]= $arg[0];
+                    break;
+            }
+        }
+
+        if ( $criteria != '' ) {
+            $arguments['criteria']= $criteria;
+        }
+        
+        return $arguments;
+
+    }
 }
 ?>

trunk/htdocs/system/classes/posts.php

@@ -659 +659 @@
         return array_search( $needle, $this->getArrayCopy() );
     }
+    
+    /**
+     * Parses a search string for status, type, author, and tag keywords. Returns
+     * an associative array which can be passed to Posts::get(). If multiple
+     * authors, statuses, tags, or types are specified, we assume an implicit OR
+     * such that (e.g.) any author that matches would be returned.
+     *
+     * @param string $search_string The search string
+     * @return array An associative array which can be passed to Posts::get()
+     */
+    public static function search_to_get( $search_string )
+    {
+        $keywords= array( 'author' => 1, 'status' => 1, 'type' => 1, 'tag' => 1 );
+        $statuses= Post::list_post_statuses();
+        $types= Post::list_active_post_types();
+        $arguments= array(
+                        'user_id' => array(),
+                        'status' => array(),
+                        'content_type' => array(),
+                        'tag' => array()
+                        );
+        $criteria= '';
+        
+        $tokens= explode( ' ', $search_string );
+        
+        foreach( $tokens as $token ) {
+            // check for a keyword:value pair
+            if ( preg_match( '/^\w+:\S+$/', $token ) ) {
+                list( $keyword, $value )= explode( ':', $token );
+
+                $keyword= strtolower( $keyword );
+                switch ( $keyword ) {
+                    case 'author':
+                        if ( $u= User::get( $value ) ) {
+                            $arguments['user_id'][]= (int) $u->id;
+                        }
+                        break;
+                    case 'tag':
+                        $arguments['tag'][]= $value;
+                        break;
+                    case 'status':
+                        if ( isset( $statuses[$value] ) ) {
+                            $arguments['status'][]= (int) $statuses[$value];
+                        }
+                        break;
+                    case 'type':
+                        if ( isset( $types[$value] ) ) {
+                            $arguments['content_type'][]= (int) $types[$value];
+                        }
+                        break;
+                }
+            }
+            else {
+                $criteria .= $token . ' ';
+            }
+        }
+
+        // flatten keys that have single-element or no-element arrays
+        foreach ( $arguments as $key => $arg ) {
+            switch ( count( $arg ) ) {
+                case 0:
+                    unset( $arguments[$key] );
+                    break;
+                case 1:
+                    $arguments[$key]= $arg[0];
+                    break;
+            }
+        }
+
+        if ( $criteria != '' ) {
+            $arguments['criteria']= $criteria;
+        }
+        
+        return $arguments;
+    }
 
 }