Changeset 4053

Timestamp:

07/04/2012 02:17:31 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Admin:

• Add nonce checks and additional sanity checks to converter, to prevent it being loaded or accessed outside of the converter screen.
• Use 'load-' actions to conditionally load admin components on their respective screens.
• Remove post_type checks that are no longer needed as a result of conditionally loading each component.
• Use get_current_screen() to fill in any extra post_type checks.
• Sweep through converter, make output more clean, add output method, and store last query in the DB in case of failure.

Location:

branches/plugin/bbp-admin

Files:

• bbp-actions.php (modified) (1 diff)
• bbp-admin.php (modified) (3 diffs)
• bbp-converter.php (modified) (29 diffs)
• bbp-forums.php (modified) (19 diffs)
• bbp-replies.php (modified) (23 diffs)
• bbp-settings.php (modified) (1 diff)
• bbp-topics.php (modified) (24 diffs)
• bbp-users.php (modified) (1 diff)

branches/plugin/bbp-admin/bbp-actions.php

@@ -49 +49 @@
 
 // Hook on to admin_init
-add_action( 'bbp_admin_init', 'bbp_admin_forums',             9 );
-add_action( 'bbp_admin_init', 'bbp_admin_topics',             9 );
-add_action( 'bbp_admin_init', 'bbp_admin_replies',            9 );
+add_action( 'bbp_admin_init', 'bbp_admin_forums'                );
+add_action( 'bbp_admin_init', 'bbp_admin_topics'                );
+add_action( 'bbp_admin_init', 'bbp_admin_replies'               );
 add_action( 'bbp_admin_init', 'bbp_setup_updater',          999 );
 add_action( 'bbp_admin_init', 'bbp_register_importers'          );

branches/plugin/bbp-admin/bbp-admin.php

@@ -77 +77 @@
 
     /**
-     * Setup the admin hooks, actions and filters
+     * Admin globals
      *
      * @since bbPress (r2646)
      * @access private
-     *
-     * @uses add_action() To add various actions
-     * @uses add_filter() To add various filters
-     */
-    private function setup_actions() {
-
-        /** General Actions ***************************************************/
-
-        // Add menu item to settings menu
-        add_action( 'bbp_admin_menu',              array( $this, 'admin_menus'             ) );
-
-        // Add some general styling to the admin area
-        add_action( 'bbp_admin_head',              array( $this, 'admin_head'              ) );
-
-        // Add notice if not using a bbPress theme
-        add_action( 'bbp_admin_notices',           array( $this, 'activation_notice'       ) );
-
-        // Add green admin style
-        add_action( 'bbp_register_admin_style',    array( $this, 'register_admin_style'    ) );
-
-        // Add settings
-        add_action( 'bbp_register_admin_settings', array( $this, 'register_admin_settings' ) );
-
-        // Add menu item to settings menu
-        add_action( 'bbp_activation',              array( $this, 'new_install'             ) );
-
-        // Forums 'Right now' Dashboard widget
-        add_action( 'wp_dashboard_setup',  array( $this, 'dashboard_widget_right_now' ) );
-
-        /** Filters ***********************************************************/
-
-        // Add link to settings page
-        add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 10, 2 );
-
-        /** Network Admin *****************************************************/
-
-        // Add menu item to settings menu
-        add_action( 'network_admin_menu',  array( $this, 'network_admin_menus' ) );
-
-        /** Dependencies ******************************************************/
-
-        // Allow plugins to modify these actions
-        do_action_ref_array( 'bbp_admin_loaded', array( &$this ) );
+     */
+    private function setup_globals() {
+        $bbp = bbpress();
+        $this->admin_dir  = trailingslashit( $bbp->plugin_dir . 'bbp-admin' ); // Admin path
+        $this->admin_url  = trailingslashit( $bbp->plugin_url . 'bbp-admin' ); // Admin url
+        $this->images_url = trailingslashit( $this->admin_url . 'images'    ); // Admin images URL
+        $this->styles_url = trailingslashit( $this->admin_url . 'styles'    ); // Admin styles URL
     }
 
@@ -144 +108 @@
 
     /**
-     * Admin globals
+     * Setup the admin hooks, actions and filters
      *
      * @since bbPress (r2646)
      * @access private
-     */
-    private function setup_globals() {
-        $bbp = bbpress();
-        $this->admin_dir  = trailingslashit( $bbp->plugin_dir . 'bbp-admin' ); // Admin url
-        $this->admin_url  = trailingslashit( $bbp->plugin_url . 'bbp-admin' ); // Admin url
-        $this->images_url = trailingslashit( $this->admin_url . 'images'    ); // Admin images URL
-        $this->styles_url = trailingslashit( $this->admin_url . 'styles'    ); // Admin styles URL
+     *
+     * @uses add_action() To add various actions
+     * @uses add_filter() To add various filters
+     */
+    private function setup_actions() {
+
+        /** General Actions ***************************************************/
+
+        add_action( 'bbp_admin_menu',              array( $this, 'admin_menus'                ) ); // Add menu item to settings menu
+        add_action( 'bbp_admin_head',              array( $this, 'admin_head'                 ) ); // Add some general styling to the admin area
+        add_action( 'bbp_admin_notices',           array( $this, 'activation_notice'          ) ); // Add notice if not using a bbPress theme
+        add_action( 'bbp_register_admin_style',    array( $this, 'register_admin_style'       ) ); // Add green admin style
+        add_action( 'bbp_register_admin_settings', array( $this, 'register_admin_settings'    ) ); // Add settings
+        add_action( 'bbp_activation',              array( $this, 'new_install'                ) ); // Add menu item to settings menu
+        add_action( 'wp_dashboard_setup',          array( $this, 'dashboard_widget_right_now' ) ); // Forums 'Right now' Dashboard widget
+
+        /** Filters ***********************************************************/
+
+        // Add link to settings page
+        add_filter( 'plugin_action_links', array( $this, 'add_settings_link' ), 10, 2 );
+
+        /** Network Admin *****************************************************/
+
+        // Add menu item to settings menu
+        add_action( 'network_admin_menu',  array( $this, 'network_admin_menus' ) );
+
+        /** Dependencies ******************************************************/
+
+        // Allow plugins to modify these actions
+        do_action_ref_array( 'bbp_admin_loaded', array( &$this ) );
     }
 
@@ -660 +647 @@
         wp_admin_css_color( 'bbpress', __( 'Green', 'bbpress' ), $css_file, array( '#222222', '#006600', '#deece1', '#6eb469' ) );
     }
+
+    /** Updaters **************************************************************/
 
     /**

branches/plugin/bbp-admin/bbp-converter.php

@@ -26 +26 @@
      */
     public function __construct() {
+
+        // Bail if request is not correct
+        switch ( strtoupper( $_SERVER['REQUEST_METHOD'] ) ) {
+
+            // Converter is converting
+            case 'POST' :
+                if ( ( empty( $_POST['action'] ) || ( 'bbconverter_process' !=  $_POST['action'] ) ) )
+                    return;
+
+                break;
+
+            // Some other admin page
+            case 'GET'  :
+                if ( ( empty( $_GET['page'] ) || ( 'bbp-converter' !=  $_GET['page'] ) ) )
+                    return;
+
+                break;
+        }
+
+        // Proceed with the actions
         $this->setup_actions();
     }
@@ -61 +81 @@
 
         // Add the main section
-        add_settings_section( 'bbpress_converter_main',     __( 'Main Settings',     'bbpress' ),  'bbp_converter_setting_callback_main_section', 'bbpress_converter' );
+        add_settings_section( 'bbpress_converter_main',     __( 'Database Settings', 'bbpress' ),  'bbp_converter_setting_callback_main_section', 'bbpress_converter' );
 
         // System Select
@@ -140 +160 @@
                 border-color: #E6DB55;
                 font-family: monospace;
+                font-weight: bold;
             }
 
@@ -145 +166 @@
                 margin: 0.5em 0;
                 padding: 2px;
-            }
-
-            div.bbp-converter-updated p strong.loading {
-                padding: 2px 20px 2px 0;
+                float: left;
+                clear: left;
+            }
+
+            div.bbp-converter-updated p.loading {
+                padding: 2px 20px 2px 2px;
                 background-image: url('<?php echo admin_url(); ?>images/wpspin_light.gif');
                 background-repeat: no-repeat;
@@ -186 +209 @@
 
                 values['action'] = 'bbconverter_process';
+                values['_ajax_nonce'] = '<?php echo  wp_create_nonce( 'bbp_converter_process' ); ?>';
+
                 return values;
             }
@@ -195 +220 @@
                     jQuery('#bbp-converter-stop').show();
                     jQuery('#bbp-converter-progress').show();
-                    bbconverter_log( "Starting Conversion..." );
+                    bbconverter_log( '<p class="loading"><?php _e( 'Starting Conversion', 'bbpress' ); ?></p>' );
                     bbconverter_run();
                 }
@@ -209 +234 @@
 
             function bbconverter_stop() {
+                jQuery('#bbp-converter-start').show();
+                jQuery('#bbp-converter-stop').hide();
+                jQuery('#bbp-converter-progress').hide();
+                jQuery('#bbp-converter-message p').removeClass( 'loading' );
                 bbconverter_is_running = false;
-                jQuery('#bbp-converter-message strong').removeClass( 'loading' );
+                clearTimeout( bbconverter_run_timer );
             }
 
@@ -216 +245 @@
                 bbconverter_log(response);
 
-                if ( response == 'Conversion Complete' || response.indexOf('error') > -1 ) {
-                    bbconverter_log('<b>Repair any missing information: <a href="<?php echo admin_url(); ?>tools.php?page=bbp-repair">Continue</a></b>');
-                    jQuery('#bbp-converter-start').show();
-                    jQuery('#bbp-converter-stop').hide();
-                    jQuery('#bbp-converter-progress').hide();
+                if ( response == '<p class="loading"><?php _e( 'Conversion Complete', 'bbpress' ); ?></p>' || response.indexOf('error') > -1 ) {
+                    bbconverter_log('<p>Repair any missing information: <a href="<?php echo admin_url(); ?>tools.php?page=bbp-repair">Continue</a></p>');
                     bbconverter_stop();
-                    clearTimeout( bbconverter_run_timer );
                 } else if( bbconverter_is_running ) { // keep going
                     jQuery('#bbp-converter-progress').show();
@@ -228 +253 @@
                     bbconverter_run_timer = setTimeout( 'bbconverter_run()', bbconverter_delay_time );
                 } else {
-                    jQuery('#bbp-converter-start').show();
-                    jQuery('#bbp-converter-stop').hide();
-                    jQuery('#bbp-converter-progress').hide();
-                    clearTimeout( bbconverter_run_timer );
+                    bbconverter_stop();
                 }
             }
@@ -240 +262 @@
                 }
                 if ( text ) {
-                    jQuery('#bbp-converter-message strong').removeClass( 'loading' );
-                    jQuery('#bbp-converter-message').prepend('<p><strong class="loading">' + text + '</strong></p>');
+                    jQuery('#bbp-converter-message p').removeClass( 'loading' );
+                    jQuery('#bbp-converter-message').prepend( text );
                 }
             }
@@ -251 +273 @@
 
     /**
+     * Wrap the converter output in paragraph tags, so styling can be applied
+     *
+     * @since bbPress (r4052)
+     *
+     * @param string $output
+     */
+    private static function converter_output( $output = '' ) {
+
+        // Get the last query
+        $before = '<p class="loading">';
+        $after  = '</p>';
+        $query  = get_option( '_bbp_converter_query' );
+
+        if ( ! empty( $query ) )
+            $before = '<p class="loading" title="' . esc_attr( $query ) . '">';
+
+        echo $before . $output . $after;
+    }
+
+    /**
      * Callback processor
      *
@@ -256 +298 @@
      */
     public function process_callback() {
+
+        // Verify intent
+        check_ajax_referer( 'bbp_converter_process' );
 
         if ( ! ini_get( 'safe_mode' ) ) {
@@ -294 +339 @@
                         $this->sync_table();
                         if ( empty( $start ) ) {
-                            _e( 'No data to clean', 'bbpress' );
+                            $this->converter_output( __( 'No data to clean', 'bbpress' ) );
                         }
                     } else {
                         update_option( '_bbp_converter_start', $max + 1 );
-                        printf( __( 'Deleting previously converted data (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                        $this->converter_output( sprintf( __( 'Deleting previously converted data (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                     }
                 } else {
@@ -314 +359 @@
                         update_option( '_bbp_converter_start', 0         );
                         if ( empty( $start ) ) {
-                            _e( 'No users to convert', 'bbpress' );
+                            $this->converter_output( __( 'No users to convert', 'bbpress' ) );
                         }
                     } else {
                         update_option( '_bbp_converter_start', $max + 1 );
-                        printf( __( 'Converting users (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                        $this->converter_output( sprintf(  __( 'Converting users (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                     }
                 } else {
@@ -334 +379 @@
                         update_option( '_bbp_converter_start', 0         );
                         if ( empty( $start ) ) {
-                            _e( 'No passwords to clear', 'bbpress' );
+                            $this->converter_output( __( 'No passwords to clear', 'bbpress' ) );
                         }
                     } else {
                         update_option( '_bbp_converter_start', $max + 1 );
-                        printf( __( 'Delete users wordpress default passwords (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                        $this->converter_output( sprintf( __( 'Delete users wordpress default passwords (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                     }
                 } else {
@@ -353 +398 @@
                     update_option( '_bbp_converter_start', 0         );
                     if ( empty( $start ) ) {
-                        _e( 'No forums to convert', 'bbpress' );
+                        $this->converter_output( __( 'No forums to convert', 'bbpress' ) );
                     }
                 } else {
                     update_option( '_bbp_converter_start', $max + 1 );
-                    printf( __( 'Converting forums (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                    $this->converter_output( sprintf( __( 'Converting forums (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                 }
 
@@ -364 +409 @@
             // STEP 5. Convert forum parents.
             case 5 :
-
                 if ( $converter->convert_forum_parents( $start ) ) {
                     update_option( '_bbp_converter_step',  $step + 1 );
                     update_option( '_bbp_converter_start', 0         );
                     if ( empty( $start ) ) {
-                        _e( 'No forum parents to convert', 'bbpress' );
+                        $this->converter_output( __( 'No forum parents to convert', 'bbpress' ) );
                     }
                 } else {
                     update_option( '_bbp_converter_start', $max + 1 );
-                    printf( __( 'Calculating forum hierarchy (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                    $this->converter_output( sprintf( __( 'Calculating forum hierarchy (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                 }
 
@@ -380 +424 @@
             // STEP 6. Convert topics.
             case 6 :
-
                 if ( $converter->convert_topics( $start ) ) {
                     update_option( '_bbp_converter_step',  $step + 1 );
                     update_option( '_bbp_converter_start', 0         );
                     if ( empty( $start ) ) {
-                        _e( 'No topics to convert', 'bbpress' );
+                        $this->converter_output( __( 'No topics to convert', 'bbpress' ) );
                     }
                 } else {
                     update_option( '_bbp_converter_start', $max + 1 );
-                    printf( __( 'Converting topics (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                    $this->converter_output( sprintf( __( 'Converting topics (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                 }
 
@@ -396 +439 @@
             // STEP 7. Convert tags.
             case 7 :
-
                 if ( $converter->convert_tags( $start ) ) {
                     update_option( '_bbp_converter_step',  $step + 1 );
                     update_option( '_bbp_converter_start', 0         );
                     if ( empty( $start ) ) {
-                        _e( 'No tags to convert', 'bbpress' );
+                        $this->converter_output( __( 'No tags to convert', 'bbpress' ) );
                     }
                 } else {
                     update_option( '_bbp_converter_start', $max + 1 );
-                    printf( __( 'Converting topic tags (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                    $this->converter_output( sprintf( __( 'Converting topic tags (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                 }
 
@@ -416 +458 @@
                     update_option( '_bbp_converter_start', 0         );
                     if ( empty( $start ) ) {
-                        _e( 'No replies to convert', 'bbpress' );
+                        $this->converter_output( __( 'No replies to convert', 'bbpress' ) );
                     }
                 } else {
                     update_option( '_bbp_converter_start', $max + 1 );
-                    printf( __( 'Converting replies (%1$s - %2$s)', 'bbpress' ), $min, $max );
+                    $this->converter_output( sprintf( __( 'Converting replies (%1$s - %2$s)', 'bbpress' ), $min, $max ) );
                 }
 
@@ -426 +468 @@
 
             default :
-                delete_option( '_bbp_converter_step' );
+                delete_option( '_bbp_converter_step'  );
                 delete_option( '_bbp_converter_start' );
-
-                _e( 'Conversion Complete', 'bbpress' );
+                delete_option( '_bbp_converter_query' );
+
+                $this->converter_output( __( 'Conversion Complete', 'bbpress' ) );
 
                 break;
-
         }
     }
@@ -813 +855 @@
             $forum_array = $this->opdb->get_results( $forum_query, ARRAY_A );
 
-            // Output the query, for better debugging
-            printf( __( '<span title="%s">View Query</span>%s', 'bbpress' ), esc_attr( $forum_query ), '<br />' );
+            // Set this query as the last one ran
+            update_option( '_bbp_converter_query', $forum_query );
 
             // Query returned some results
@@ -958 +1000 @@
 
     public function convert_forum_parents( $start ) {
+
         $has_update = false;
 
-        if ( !empty( $this->sync_table ) ) {
-            $forum_array = $this->wpdb->get_results( 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_forum_parent_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows );
-        } else {
-            $forum_array = $this->wpdb->get_results( 'SELECT post_id AS value_id, meta_value FROM ' . $this->wpdb->postmeta . ' WHERE meta_key = "_bbp_forum_parent_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows );
-        }
+        if ( !empty( $this->sync_table ) )
+            $query = 'SELECT value_id, meta_value FROM ' . $this->sync_table_name . ' WHERE meta_key = "_bbp_forum_parent_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows;
+        else
+            $query = 'SELECT post_id AS value_id, meta_value FROM ' . $this->wpdb->postmeta . ' WHERE meta_key = "_bbp_forum_parent_id" AND meta_value > 0 LIMIT ' . $start . ', ' . $this->max_rows;
+
+        update_option( '_bbp_converter_query', $query );
+
+        $forum_array = $this->wpdb->get_results( $query );
 
         foreach ( (array) $forum_array as $row ) {
@@ -979 +1025 @@
      */
     public function clean( $start ) {
+
         $start      = 0;
         $has_delete = false;
@@ -984 +1031 @@
         /** Delete bbconverter topics/forums/posts ****************************/
 
-        if ( true === $this->sync_table ) {
-            $bbconverter = $this->wpdb->get_results( 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->posts . ' ON(value_id = ID) WHERE meta_key LIKE "_bbp_%" AND value_type = "post" GROUP BY value_id ORDER BY value_id DESC LIMIT ' . $this->max_rows, ARRAY_A );
-        } else {
-            $bbconverter = $this->wpdb->get_results( 'SELECT post_id AS value_id FROM ' . $this->wpdb->postmeta . ' WHERE meta_key LIKE "_bbp_%" GROUP BY post_id ORDER BY post_id DESC LIMIT ' . $this->max_rows, ARRAY_A );
-        }
-
-        if ( !empty( $bbconverter ) ) {
-            foreach ( (array) $bbconverter as $value ) {
+        if ( true === $this->sync_table )
+            $query = 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->posts . ' ON(value_id = ID) WHERE meta_key LIKE "_bbp_%" AND value_type = "post" GROUP BY value_id ORDER BY value_id DESC LIMIT ' . $this->max_rows;
+        else
+            $query = 'SELECT post_id AS value_id FROM ' . $this->wpdb->postmeta . ' WHERE meta_key LIKE "_bbp_%" GROUP BY post_id ORDER BY post_id DESC LIMIT ' . $this->max_rows;
+
+        update_option( '_bbp_converter_query', $query );
+
+        $posts = $this->wpdb->get_results( $query, ARRAY_A );
+
+        if ( !empty( $posts ) ) {
+            foreach ( (array) $posts as $value ) {
                 wp_delete_post( $value['value_id'], true );
             }
@@ -999 +1049 @@
         /** Delete bbconverter users ******************************************/
 
-        if ( true === $this->sync_table ) {
-            $bbconverter = $this->wpdb->get_results( 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->users . ' ON(value_id = ID) WHERE meta_key = "_bbp_user_id" AND value_type = "user" LIMIT ' . $this->max_rows, ARRAY_A );
-        } else {
-            $bbconverter = $this->wpdb->get_results( 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_user_id" LIMIT ' . $this->max_rows, ARRAY_A );
-        }
-
-        if ( !empty( $bbconverter ) ) {
-            foreach ( $bbconverter as $value ) {
+        if ( true === $this->sync_table )
+            $query = 'SELECT value_id FROM ' . $this->sync_table_name . ' INNER JOIN ' . $this->wpdb->users . ' ON(value_id = ID) WHERE meta_key = "_bbp_user_id" AND value_type = "user" LIMIT ' . $this->max_rows;
+        else
+            $query = 'SELECT user_id AS value_id FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_user_id" LIMIT ' . $this->max_rows;
+
+        update_option( '_bbp_converter_query', $query );
+
+        $users = $this->wpdb->get_results( $query, ARRAY_A );
+
+        if ( !empty( $users ) ) {
+            foreach ( $users as $value ) {
                 wp_delete_user( $value['value_id'] );
             }
@@ -1012 +1065 @@
         }
 
+        unset( $posts );
+        unset( $users );
+
         return ! $has_delete;
     }
@@ -1021 +1077 @@
      */
     public function clean_passwords( $start ) {
+
         $has_delete = false;
 
         /** Delete bbconverter passwords **************************************/
 
-        $bbconverter = $this->wpdb->get_results( 'SELECT user_id, meta_value FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_password" LIMIT ' . $start . ', ' . $this->max_rows, ARRAY_A );
+        $query       = 'SELECT user_id, meta_value FROM ' . $this->wpdb->usermeta . ' WHERE meta_key = "_bbp_password" LIMIT ' . $start . ', ' . $this->max_rows;
+        update_option( '_bbp_converter_query', $query );
+
+        $bbconverter = $this->wpdb->get_results( $query, ARRAY_A );
+
         if ( !empty( $bbconverter ) ) {
 
@@ -1038 +1099 @@
             $has_delete = true;
         }
+
         return ! $has_delete;
     }

branches/plugin/bbp-admin/bbp-forums.php

@@ -26 +26 @@
      * @var The post type of this admin component
      */
-    var $post_type = '';
+    private $post_type = '';
 
     /** Functions *************************************************************/
@@ -102 +102 @@
     public function edit_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the forum post type
-        if ( $post_type != $this->post_type )
-            return;
-
         // Overview
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'overview',
             'title'     => __( 'Overview', 'bbpress' ),
@@ -122 +111 @@
 
         // Screen Content
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'screen-content',
             'title'     => __( 'Screen Content', 'bbpress' ),
@@ -136 +125 @@
 
         // Available Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'action-links',
             'title'     => __( 'Available Actions', 'bbpress' ),
@@ -151 +140 @@
 
         // Bulk Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'bulk-actions',
             'title'     => __( 'Bulk Actions', 'bbpress' ),
@@ -160 +149 @@
 
         // Help Sidebar
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -175 +164 @@
     public function new_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the forum post type
-        if ( $post_type != $this->post_type )
-            return;
-
         $customize_display = '<p>' . __( 'The title field and the big forum editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.', 'bbpress' ) . '</p>';
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'customize-display',
             'title'   => __( 'Customizing This Display', 'bbpress' ),
@@ -194 +172 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'title-forum-editor',
             'title'   => __( 'Title and Forum Editor', 'bbpress' ),
@@ -212 +190 @@
         }
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'forum-attributes',
             'title'   => __( 'Forum Attributes', 'bbpress' ),
@@ -226 +204 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'publish-box',
             'title'   => __( 'Publish Box', 'bbpress' ),
@@ -232 +210 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'discussion-settings',
             'title'   => __( 'Discussion Settings', 'bbpress' ),
@@ -240 +218 @@
         ) );
 
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -309 +287 @@
             return $forum_id;
 
-        // Bail if post_type is not a topic or reply
-        if ( get_post_type( $forum_id ) != $this->post_type )
-            return $forum_id;
-
         // Parent ID
         $parent_id = ( !empty( $_POST['parent_id'] ) && is_numeric( $_POST['parent_id'] ) ) ? (int) $_POST['parent_id'] : 0;
@@ -339 +313 @@
      */
     function admin_head() {
-
-        if ( get_post_type() == $this->post_type ) : ?>
-
-            <style type="text/css" media="screen">
-            /*<![CDATA[*/
-
-                #misc-publishing-actions,
-                #save-post {
-                    display: none;
-                }
-
-                strong.label {
-                    display: inline-block;
-                    width: 60px;
-                }
-
-                #bbp_forum_attributes hr {
-                    border-style: solid;
-                    border-width: 1px;
-                    border-color: #ccc #fff #fff #ccc;
-                }
-
-                .column-bbp_forum_topic_count,
-                .column-bbp_forum_reply_count,
-                .column-bbp_topic_reply_count,
-                .column-bbp_topic_voice_count {
-                    width: 8% !important;
-                }
-
-                .column-author,
-                .column-bbp_reply_author,
-                .column-bbp_topic_author {
-                    width: 10% !important;
-                }
-
-                .column-bbp_topic_forum,
-                .column-bbp_reply_forum,
-                .column-bbp_reply_topic {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_freshness,
-                .column-bbp_topic_freshness {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_created,
-                .column-bbp_topic_created,
-                .column-bbp_reply_created {
-                    width: 15% !important;
-                }
-
-                .status-closed {
-                    background-color: #eaeaea;
-                }
-
-                .status-spam {
-                    background-color: #faeaea;
-                }
-
-            /*]]>*/
-            </style>
-
-        <?php endif; ?>
+        ?>
+
+        <style type="text/css" media="screen">
+        /*<![CDATA[*/
+
+            #misc-publishing-actions,
+            #save-post {
+                display: none;
+            }
+
+            strong.label {
+                display: inline-block;
+                width: 60px;
+            }
+
+            #bbp_forum_attributes hr {
+                border-style: solid;
+                border-width: 1px;
+                border-color: #ccc #fff #fff #ccc;
+            }
+
+            .column-bbp_forum_topic_count,
+            .column-bbp_forum_reply_count,
+            .column-bbp_topic_reply_count,
+            .column-bbp_topic_voice_count {
+                width: 8% !important;
+            }
+
+            .column-author,
+            .column-bbp_reply_author,
+            .column-bbp_topic_author {
+                width: 10% !important;
+            }
+
+            .column-bbp_topic_forum,
+            .column-bbp_reply_forum,
+            .column-bbp_reply_topic {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_freshness,
+            .column-bbp_topic_freshness {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_created,
+            .column-bbp_topic_created,
+            .column-bbp_reply_created {
+                width: 15% !important;
+            }
+
+            .status-closed {
+                background-color: #eaeaea;
+            }
+
+            .status-spam {
+                background-color: #faeaea;
+            }
+
+        /*]]>*/
+        </style>
 
         <?php
@@ -495 +466 @@
      */
     function row_actions( $actions, $forum ) {
-        if ( $forum->post_type == $this->post_type ) {
-            unset( $actions['inline hide-if-no-js'] );
-
-            // simple hack to show the forum description under the title
-            bbp_forum_content( $forum->ID );
-        }
+        unset( $actions['inline hide-if-no-js'] );
+
+        // simple hack to show the forum description under the title
+        bbp_forum_content( $forum->ID );
 
         return $actions;
@@ -511 +480 @@
      *
      * @global int $post_ID
-     * @uses get_post_type()
      * @uses bbp_get_forum_permalink()
      * @uses wp_post_revision_title()
@@ -523 +491 @@
     function updated_messages( $messages ) {
         global $post_ID;
-
-        if ( get_post_type( $post_ID ) != $this->post_type )
-            return $messages;
 
         // URL for the current forum
@@ -583 +548 @@
  * Setup bbPress Forums Admin
  *
+ * This is currently here to make hooking and unhooking of the admin UI easy.
+ * It could use dependency injection in the future, but for now this is easier.
+ *
  * @since bbPress (r2596)
  *
@@ -588 +556 @@
  */
 function bbp_admin_forums() {
+    global $typenow;
+
+    if ( bbp_get_forum_post_type() != $typenow )
+        return;
+
     bbpress()->admin->forums = new BBP_Forums_Admin();
 }

branches/plugin/bbp-admin/bbp-replies.php

@@ -26 +26 @@
      * @var The post type of this admin component
      */
-    var $post_type = '';
+    private $post_type = '';
 
     /** Functions *************************************************************/
@@ -76 +76 @@
 
         // Check if there are any bbp_toggle_reply_* requests on admin_init, also have a message displayed
-        add_action( 'bbp_admin_init', array( $this, 'toggle_reply'        ) );
+        add_action( 'load-edit.php',  array( $this, 'toggle_reply'        ) );
         add_action( 'admin_notices',  array( $this, 'toggle_reply_notice' ) );
 
@@ -114 +114 @@
     public function edit_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the reply post type
-        if ( $post_type != $this->post_type )
-            return;
-
         // Overview
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'overview',
             'title'     => __( 'Overview', 'bbpress' ),
@@ -134 +123 @@
 
         // Screen Content
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'screen-content',
             'title'     => __( 'Screen Content', 'bbpress' ),
@@ -148 +137 @@
 
         // Available Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'action-links',
             'title'     => __( 'Available Actions', 'bbpress' ),
@@ -163 +152 @@
 
         // Bulk Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'bulk-actions',
             'title'     => __( 'Bulk Actions', 'bbpress' ),
@@ -172 +161 @@
 
         // Help Sidebar
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -187 +176 @@
     public function new_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the reply post type
-        if ( $post_type != $this->post_type )
-            return;
-
         $customize_display = '<p>' . __( 'The title field and the big reply editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.', 'bbpress' ) . '</p>';
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'customize-display',
             'title'   => __( 'Customizing This Display', 'bbpress' ),
@@ -206 +184 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'title-reply-editor',
             'title'   => __( 'Title and Reply Editor', 'bbpress' ),
@@ -224 +202 @@
         }
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'reply-attributes',
             'title'   => __( 'Reply Attributes', 'bbpress' ),
@@ -235 +213 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'publish-box',
             'title'   => __( 'Publish Box', 'bbpress' ),
@@ -241 +219 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'discussion-settings',
             'title'   => __( 'Discussion Settings', 'bbpress' ),
@@ -249 +227 @@
         ) );
 
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -308 +286 @@
             return $reply_id;
 
-        // Bail if post_type is not a reply
-        if ( get_post_type( $reply_id ) != $this->post_type )
-            return $reply_id;
-
         // Current user cannot edit this reply
         if ( !current_user_can( 'edit_reply', $reply_id ) )
@@ -347 +321 @@
 
         // Bail if post_type is not a reply
-        if ( ( empty( $_GET['action'] ) || ( 'edit' != $_GET['action'] ) ) || ( get_post_type() != $this->post_type ) )
+        if ( empty( $_GET['action'] ) || ( 'edit' != $_GET['action'] ) )
             return;
 
@@ -393 +367 @@
             return $post_id;
 
-        // Bail if post_type is not a topic or reply
-        if ( get_post_type( $post_id ) != $this->post_type )
-            return;
-
         // Bail if user cannot edit replies or reply is not anonymous
         if ( !current_user_can( 'edit_reply', $post_id ) )
@@ -424 +394 @@
      */
     function admin_head() {
-
-        if ( get_post_type() == $this->post_type ) : ?>
-
-            <style type="text/css" media="screen">
-            /*<![CDATA[*/
-
-                .column-bbp_forum_topic_count,
-                .column-bbp_forum_reply_count,
-                .column-bbp_topic_reply_count,
-                .column-bbp_topic_voice_count {
-                    width: 8% !important;
-                }
-
-                .column-author,
-                .column-bbp_reply_author,
-                .column-bbp_topic_author {
-                    width: 10% !important;
-                }
-
-                .column-bbp_topic_forum,
-                .column-bbp_reply_forum,
-                .column-bbp_reply_topic {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_freshness,
-                .column-bbp_topic_freshness {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_created,
-                .column-bbp_topic_created,
-                .column-bbp_reply_created {
-                    width: 15% !important;
-                }
-
-                .status-closed {
-                    background-color: #eaeaea;
-                }
-
-                .status-spam {
-                    background-color: #faeaea;
-                }
-
-            /*]]>*/
-            </style>
-
-        <?php endif;
-
+        ?>
+
+        <style type="text/css" media="screen">
+        /*<![CDATA[*/
+
+            .column-bbp_forum_topic_count,
+            .column-bbp_forum_reply_count,
+            .column-bbp_topic_reply_count,
+            .column-bbp_topic_voice_count {
+                width: 8% !important;
+            }
+
+            .column-author,
+            .column-bbp_reply_author,
+            .column-bbp_topic_author {
+                width: 10% !important;
+            }
+
+            .column-bbp_topic_forum,
+            .column-bbp_reply_forum,
+            .column-bbp_reply_topic {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_freshness,
+            .column-bbp_topic_freshness {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_created,
+            .column-bbp_topic_created,
+            .column-bbp_reply_created {
+                width: 15% !important;
+            }
+
+            .status-closed {
+                background-color: #eaeaea;
+            }
+
+            .status-spam {
+                background-color: #faeaea;
+            }
+
+        /*]]>*/
+        </style>
+
+        <?php
     }
 
@@ -815 +783 @@
     function filter_dropdown() {
 
-        // Bail if not viewing the topics list
-        if (
-                // post_type exists in _GET
-                empty( $_GET['post_type'] ) ||
-
-                // post_type is reply or topic type
-                ( $_GET['post_type'] != $this->post_type )
-            )
-            return;
-
         // Add Empty Spam button
         if ( !empty( $_GET['post_status'] ) && ( bbp_get_spam_status_id() == $_GET['post_status'] ) && current_user_can( 'moderate' ) ) {
@@ -856 +814 @@
         global $pagenow;
 
-        // Avoid poisoning other requests
-        if (
-                // Only look in admin
-                !is_admin()                 ||
-
-                // Make sure the current page is for post rows
-                ( 'edit.php' != $pagenow  ) ||
-
-                // Make sure we're looking for a post_type
-                empty( $_GET['post_type'] ) ||
-
-                // Make sure we're looking at bbPress topics
-                ( $_GET['post_type'] != $this->post_type )
-            )
-
-            // We're in no shape to filter anything, so return
-            return $query_vars;
-
         // Add post_parent query_var if one is present
         if ( !empty( $_GET['bbp_forum_id'] ) ) {
@@ -890 +830 @@
      *
      * @global int $post_ID
-     * @uses get_post_type()
      * @uses bbp_get_topic_permalink()
      * @uses wp_post_revision_title()
@@ -902 +841 @@
     function updated_messages( $messages ) {
         global $post_ID;
-
-        if ( get_post_type( $post_ID ) != $this->post_type )
-            return $messages;
 
         // URL for the current topic
@@ -962 +898 @@
  * Setup bbPress Replies Admin
  *
+ * This is currently here to make hooking and unhooking of the admin UI easy.
+ * It could use dependency injection in the future, but for now this is easier.
+ * 
  * @since bbPress (r2596)
  *
@@ -967 +906 @@
  */
 function bbp_admin_replies() {
+    global $typenow;
+
+    if ( bbp_get_reply_post_type() == $typenow )
+        return;
+
     bbpress()->admin->replies = new BBP_Replies_Admin();
 }

branches/plugin/bbp-admin/bbp-settings.php

@@ -1146 +1146 @@
 
     <input id="_bbp_converter_restart" name="_bbp_converter_restart" type="checkbox" id="_bbp_converter_restart" value="1" <?php checked( get_option( '_bbp_converter_restart', false ) ); ?> />
-    <label for="_bbp_converter_restart"><?php _e( 'Restart the conversion process', 'bbpress' ); ?></label>
+    <label for="_bbp_converter_restart"><?php _e( 'Restart conversion from the beginning', 'bbpress' ); ?></label>
     <p class="description"><?php _e( 'The importer keeps track of where it left off in the event of failure.', 'bbpress' ); ?></p>
 

branches/plugin/bbp-admin/bbp-topics.php

@@ -26 +26 @@
      * @var The post type of this admin component
      */
-    var $post_type = '';
+    private $post_type = '';
 
     /** Functions *************************************************************/
@@ -76 +76 @@
 
         // Check if there are any bbp_toggle_topic_* requests on admin_init, also have a message displayed
-        add_action( 'bbp_admin_init', array( $this, 'toggle_topic'        ) );
+        add_action( 'load-edit.php',  array( $this, 'toggle_topic'        ) );
         add_action( 'admin_notices',  array( $this, 'toggle_topic_notice' ) );
 
@@ -114 +114 @@
     public function edit_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the topic post type
-        if ( $post_type != $this->post_type )
-            return;
-
         // Overview
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'overview',
             'title'     => __( 'Overview', 'bbpress' ),
@@ -134 +123 @@
 
         // Screen Content
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'screen-content',
             'title'     => __( 'Screen Content', 'bbpress' ),
@@ -148 +137 @@
 
         // Available Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'action-links',
             'title'     => __( 'Available Actions', 'bbpress' ),
@@ -163 +152 @@
 
         // Bulk Actions
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'        => 'bulk-actions',
             'title'     => __( 'Bulk Actions', 'bbpress' ),
@@ -172 +161 @@
 
         // Help Sidebar
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -187 +176 @@
     public function new_help() {
 
-        $current_screen = get_current_screen();
-        $post_type      = !empty( $_REQUEST['post_type'] ) ? $_REQUEST['post_type'] : '';
-
-        // Bail if current screen could not be found
-        if ( empty( $current_screen ) )
-            return;
-
-        // Bail if not the topic post type
-        if ( $post_type != $this->post_type )
-            return;
-
         $customize_display = '<p>' . __( 'The title field and the big topic editing Area are fixed in place, but you can reposition all the other boxes using drag and drop, and can minimize or expand them by clicking the title bar of each box. Use the Screen Options tab to unhide more boxes (Excerpt, Send Trackbacks, Custom Fields, Discussion, Slug, Author) or to choose a 1- or 2-column layout for this screen.', 'bbpress' ) . '</p>';
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'customize-display',
             'title'   => __( 'Customizing This Display', 'bbpress' ),
@@ -206 +184 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'title-topic-editor',
             'title'   => __( 'Title and Topic Editor', 'bbpress' ),
@@ -224 +202 @@
         }
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'topic-attributes',
             'title'   => __( 'Topic Attributes', 'bbpress' ),
@@ -235 +213 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'publish-box',
             'title'   => __( 'Publish Box', 'bbpress' ),
@@ -241 +219 @@
         ) );
 
-        $current_screen->add_help_tab( array(
+        get_current_screen()->add_help_tab( array(
             'id'      => 'discussion-settings',
             'title'   => __( 'Discussion Settings', 'bbpress' ),
@@ -249 +227 @@
         ) );
 
-        $current_screen->set_help_sidebar(
+        get_current_screen()->set_help_sidebar(
             '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
             '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
@@ -304 +282 @@
             return $topic_id;
 
-        // Bail if post_type is not a topic
-        if ( get_post_type( $topic_id ) != $this->post_type )
-            return $topic_id;
-
         // Bail if current user cannot edit this topic
         if ( !current_user_can( 'edit_topic', $topic_id ) )
@@ -364 +338 @@
 
         // Bail if post_type is not a topic
-        if ( ( empty( $_GET['action'] ) || ( 'edit' != $_GET['action'] ) ) || ( get_post_type() != $this->post_type ) )
+        if ( empty( $_GET['action'] ) || ( 'edit' != $_GET['action'] ) )
             return;
 
@@ -410 +384 @@
             return $post_id;
 
-        // Bail if post_type is not a topic or reply
-        if ( get_post_type( $post_id ) != $this->post_type )
-            return;
-
         // Bail if user cannot edit replies
         if ( !current_user_can( 'edit_topic', $post_id ) )
@@ -441 +411 @@
      */
     function admin_head() {
-
-        if ( get_post_type() == $this->post_type ) : ?>
-
-            <style type="text/css" media="screen">
-            /*<![CDATA[*/
-
-                .column-bbp_forum_topic_count,
-                .column-bbp_forum_reply_count,
-                .column-bbp_topic_reply_count,
-                .column-bbp_topic_voice_count {
-                    width: 8% !important;
-                }
-
-                .column-author,
-                .column-bbp_reply_author,
-                .column-bbp_topic_author {
-                    width: 10% !important;
-                }
-
-                .column-bbp_topic_forum,
-                .column-bbp_reply_forum,
-                .column-bbp_reply_topic {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_freshness,
-                .column-bbp_topic_freshness {
-                    width: 10% !important;
-                }
-
-                .column-bbp_forum_created,
-                .column-bbp_topic_created,
-                .column-bbp_reply_created {
-                    width: 15% !important;
-                }
-
-                .status-closed {
-                    background-color: #eaeaea;
-                }
-
-                .status-spam {
-                    background-color: #faeaea;
-                }
-
-            /*]]>*/
-            </style>
-
-        <?php endif;
-
+        ?>
+
+        <style type="text/css" media="screen">
+        /*<![CDATA[*/
+
+            .column-bbp_forum_topic_count,
+            .column-bbp_forum_reply_count,
+            .column-bbp_topic_reply_count,
+            .column-bbp_topic_voice_count {
+                width: 8% !important;
+            }
+
+            .column-author,
+            .column-bbp_reply_author,
+            .column-bbp_topic_author {
+                width: 10% !important;
+            }
+
+            .column-bbp_topic_forum,
+            .column-bbp_reply_forum,
+            .column-bbp_reply_topic {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_freshness,
+            .column-bbp_topic_freshness {
+                width: 10% !important;
+            }
+
+            .column-bbp_forum_created,
+            .column-bbp_topic_created,
+            .column-bbp_reply_created {
+                width: 15% !important;
+            }
+
+            .status-closed {
+                background-color: #eaeaea;
+            }
+
+            .status-spam {
+                background-color: #faeaea;
+            }
+
+        /*]]>*/
+        </style>
+
+        <?php
     }
 
@@ -812 +780 @@
     function topics_row_actions( $actions, $topic ) {
 
-        if ( $topic->post_type == $this->post_type ) {
-            unset( $actions['inline hide-if-no-js'] );
-
-            // Show view link if it's not set, the topic is trashed and the user can view trashed topics
-            if ( empty( $actions['view'] ) && ( bbp_get_trash_status_id() == $topic->post_status ) && current_user_can( 'view_trash' ) )
-                $actions['view'] = '<a href="' . bbp_get_topic_permalink( $topic->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;', 'bbpress' ), bbp_get_topic_title( $topic->ID ) ) ) . '" rel="permalink">' . __( 'View', 'bbpress' ) . '</a>';
-
-            // Only show the actions if the user is capable of viewing them :)
-            if ( current_user_can( 'moderate', $topic->ID ) ) {
-
-                // Close
-                // Show the 'close' and 'open' link on published and closed posts only
-                if ( in_array( $topic->post_status, array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ) ) {
-                    $close_uri = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_close' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'close-topic_' . $topic->ID ) );
-                    if ( bbp_is_topic_open( $topic->ID ) )
-                        $actions['closed'] = '<a href="' . $close_uri . '" title="' . esc_attr__( 'Close this topic', 'bbpress' ) . '">' . _x( 'Close', 'Close a Topic', 'bbpress' ) . '</a>';
-                    else
-                        $actions['closed'] = '<a href="' . $close_uri . '" title="' . esc_attr__( 'Open this topic',  'bbpress' ) . '">' . _x( 'Open',  'Open a Topic',  'bbpress' ) . '</a>';
+        unset( $actions['inline hide-if-no-js'] );
+
+        // Show view link if it's not set, the topic is trashed and the user can view trashed topics
+        if ( empty( $actions['view'] ) && ( bbp_get_trash_status_id() == $topic->post_status ) && current_user_can( 'view_trash' ) )
+            $actions['view'] = '<a href="' . bbp_get_topic_permalink( $topic->ID ) . '" title="' . esc_attr( sprintf( __( 'View &#8220;%s&#8221;', 'bbpress' ), bbp_get_topic_title( $topic->ID ) ) ) . '" rel="permalink">' . __( 'View', 'bbpress' ) . '</a>';
+
+        // Only show the actions if the user is capable of viewing them :)
+        if ( current_user_can( 'moderate', $topic->ID ) ) {
+
+            // Close
+            // Show the 'close' and 'open' link on published and closed posts only
+            if ( in_array( $topic->post_status, array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ) ) {
+                $close_uri = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_close' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'close-topic_' . $topic->ID ) );
+                if ( bbp_is_topic_open( $topic->ID ) )
+                    $actions['closed'] = '<a href="' . $close_uri . '" title="' . esc_attr__( 'Close this topic', 'bbpress' ) . '">' . _x( 'Close', 'Close a Topic', 'bbpress' ) . '</a>';
+                else
+                    $actions['closed'] = '<a href="' . $close_uri . '" title="' . esc_attr__( 'Open this topic',  'bbpress' ) . '">' . _x( 'Open',  'Open a Topic',  'bbpress' ) . '</a>';
+            }
+
+            // Dont show sticky if topic links is spam or trash
+            if ( !bbp_is_topic_spam( $topic->ID ) && !bbp_is_topic_trash( $topic->ID ) ) {
+
+                // Sticky
+                $stick_uri  = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_stick' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'stick-topic_'  . $topic->ID ) );
+                if ( bbp_is_topic_sticky( $topic->ID ) ) {
+                    $actions['stick'] = '<a href="' . $stick_uri . '" title="' . esc_attr__( 'Unstick this topic', 'bbpress' ) . '">' . __( 'Unstick', 'bbpress' ) . '</a>';
+                } else {
+                    $super_uri        = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_stick', 'super' => '1' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'stick-topic_'  . $topic->ID ) );
+                    $actions['stick'] = '<a href="' . $stick_uri . '" title="' . esc_attr__( 'Stick this topic to its forum', 'bbpress' ) . '">' . __( 'Stick', 'bbpress' ) . '</a> (<a href="' . $super_uri . '" title="' . esc_attr__( 'Stick this topic to front', 'bbpress' ) . '">' . __( 'to front', 'bbpress' ) . '</a>)';
                 }
-
-                // Dont show sticky if topic links is spam or trash
-                if ( !bbp_is_topic_spam( $topic->ID ) && !bbp_is_topic_trash( $topic->ID ) ) {
-
-                    // Sticky
-                    $stick_uri  = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_stick' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'stick-topic_'  . $topic->ID ) );
-                    if ( bbp_is_topic_sticky( $topic->ID ) ) {
-                        $actions['stick'] = '<a href="' . $stick_uri . '" title="' . esc_attr__( 'Unstick this topic', 'bbpress' ) . '">' . __( 'Unstick', 'bbpress' ) . '</a>';
-                    } else {
-                        $super_uri        = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_stick', 'super' => '1' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'stick-topic_'  . $topic->ID ) );
-                        $actions['stick'] = '<a href="' . $stick_uri . '" title="' . esc_attr__( 'Stick this topic to its forum', 'bbpress' ) . '">' . __( 'Stick', 'bbpress' ) . '</a> (<a href="' . $super_uri . '" title="' . esc_attr__( 'Stick this topic to front', 'bbpress' ) . '">' . __( 'to front', 'bbpress' ) . '</a>)';
-                    }
-                }
-
-                // Spam
-                $spam_uri  = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_spam' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'spam-topic_'  . $topic->ID ) );
-                if ( bbp_is_topic_spam( $topic->ID ) )
-                    $actions['spam'] = '<a href="' . $spam_uri . '" title="' . esc_attr__( 'Mark the topic as not spam', 'bbpress' ) . '">' . __( 'Not spam', 'bbpress' ) . '</a>';
-                else
-                    $actions['spam'] = '<a href="' . $spam_uri . '" title="' . esc_attr__( 'Mark this topic as spam',    'bbpress' ) . '">' . __( 'Spam',     'bbpress' ) . '</a>';
-
-            }
-
-            // Do not show trash links for spam topics, or spam links for trashed topics
-            if ( current_user_can( 'delete_topic', $topic->ID ) ) {
-                if ( bbp_get_trash_status_id() == $topic->post_status ) {
-                    $post_type_object   = get_post_type_object( bbp_get_topic_post_type() );
-                    $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash', 'bbpress' ) . "' href='" . wp_nonce_url( add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $topic->ID ) ) ), 'untrash-' . $topic->post_type . '_' . $topic->ID ) . "'>" . __( 'Restore', 'bbpress' ) . "</a>";
-                } elseif ( EMPTY_TRASH_DAYS ) {
-                    $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash', 'bbpress' ) . "' href='" . add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), get_delete_post_link( $topic->ID ) ) . "'>" . __( 'Trash', 'bbpress' ) . "</a>";
-                }
-
-                if ( bbp_get_trash_status_id() == $topic->post_status || !EMPTY_TRASH_DAYS ) {
-                    $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently', 'bbpress' ) . "' href='" . add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), get_delete_post_link( $topic->ID, '', true ) ) . "'>" . __( 'Delete Permanently', 'bbpress' ) . "</a>";
-                } elseif ( bbp_get_spam_status_id() == $topic->post_status ) {
-                    unset( $actions['trash'] );
-                }
+            }
+
+            // Spam
+            $spam_uri  = esc_url( wp_nonce_url( add_query_arg( array( 'topic_id' => $topic->ID, 'action' => 'bbp_toggle_topic_spam' ), remove_query_arg( array( 'bbp_topic_toggle_notice', 'topic_id', 'failed', 'super' ) ) ), 'spam-topic_'  . $topic->ID ) );
+            if ( bbp_is_topic_spam( $topic->ID ) )
+                $actions['spam'] = '<a href="' . $spam_uri . '" title="' . esc_attr__( 'Mark the topic as not spam', 'bbpress' ) . '">' . __( 'Not spam', 'bbpress' ) . '</a>';
+            else
+                $actions['spam'] = '<a href="' . $spam_uri . '" title="' . esc_attr__( 'Mark this topic as spam',    'bbpress' ) . '">' . __( 'Spam',     'bbpress' ) . '</a>';
+
+        }
+
+        // Do not show trash links for spam topics, or spam links for trashed topics
+        if ( current_user_can( 'delete_topic', $topic->ID ) ) {
+            if ( bbp_get_trash_status_id() == $topic->post_status ) {
+                $post_type_object   = get_post_type_object( bbp_get_topic_post_type() );
+                $actions['untrash'] = "<a title='" . esc_attr__( 'Restore this item from the Trash', 'bbpress' ) . "' href='" . wp_nonce_url( add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $topic->ID ) ) ), 'untrash-' . $topic->post_type . '_' . $topic->ID ) . "'>" . __( 'Restore', 'bbpress' ) . "</a>";
+            } elseif ( EMPTY_TRASH_DAYS ) {
+                $actions['trash'] = "<a class='submitdelete' title='" . esc_attr__( 'Move this item to the Trash', 'bbpress' ) . "' href='" . add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), get_delete_post_link( $topic->ID ) ) . "'>" . __( 'Trash', 'bbpress' ) . "</a>";
+            }
+
+            if ( bbp_get_trash_status_id() == $topic->post_status || !EMPTY_TRASH_DAYS ) {
+                $actions['delete'] = "<a class='submitdelete' title='" . esc_attr__( 'Delete this item permanently', 'bbpress' ) . "' href='" . add_query_arg( array( '_wp_http_referer' => add_query_arg( array( 'post_type' => bbp_get_topic_post_type() ), admin_url( 'edit.php' ) ) ), get_delete_post_link( $topic->ID, '', true ) ) . "'>" . __( 'Delete Permanently', 'bbpress' ) . "</a>";
+            } elseif ( bbp_get_spam_status_id() == $topic->post_status ) {
+                unset( $actions['trash'] );
             }
         }
@@ -885 +851 @@
      */
     function filter_dropdown() {
-
-        // Bail if not viewing the topics list
-        if (
-                // post_type exists in _GET
-                empty( $_GET['post_type'] ) ||
-
-                // post_type is not topic type
-                ( $_GET['post_type'] != $this->post_type )
-            )
-            return;
 
         // Add Empty Spam button
@@ -925 +881 @@
      */
     function filter_post_rows( $query_vars ) {
-        global $pagenow;
-
-        // Avoid poisoning other requests
-        if (
-                // Only look in admin
-                !is_admin()                 ||
-
-                // Make sure the current page is for post rows
-                ( 'edit.php' != $pagenow  ) ||
-
-                // Make sure we're looking for a post_type
-                empty( $_GET['post_type'] ) ||
-
-                // Make sure we're looking at bbPress topics
-                ( $_GET['post_type'] != $this->post_type )
-            )
-
-            // We're in no shape to filter anything, so return
-            return $query_vars;
 
         // Add post_parent query_var if one is present
@@ -961 +898 @@
      *
      * @global int $post_ID
-     * @uses get_post_type()
      * @uses bbp_get_topic_permalink()
      * @uses wp_post_revision_title()
@@ -973 +909 @@
     function updated_messages( $messages ) {
         global $post_ID;
-
-        if ( get_post_type( $post_ID ) != $this->post_type )
-            return $messages;
 
         // URL for the current topic
@@ -1033 +966 @@
  * Setup bbPress Topics Admin
  *
+ * This is currently here to make hooking and unhooking of the admin UI easy.
+ * It could use dependency injection in the future, but for now this is easier.
+ *
  * @since bbPress (r2596)
  *
@@ -1038 +974 @@
  */
 function bbp_admin_topics() {
+    global $typenow;
+
+    if ( bbp_get_topic_post_type() != $typenow )
+        return;
+
     bbpress()->admin->topics = new BBP_Topics_Admin();
 }

branches/plugin/bbp-admin/bbp-users.php

@@ -100 +100 @@
 }
 endif; // class exists
-
-/**
- * Setup bbPress Users Admin
- *
- * @since bbPress (r2596)
- *
- * @uses BBP_Replies_Admin
- */
-function bbp_users_admin() {
-    bbpress()->admin->users = new BBP_Users_Admin();
-}