Changeset 6601

Timestamp:

06/23/2017 04:21:58 AM (9 years ago)

Author:

johnjamesjacoby

Message:

Admin/Converter: Lazy load admin & converter as needed.

• Move admin class into its own file
• Remove admin.php
• Introduce _setup_ functions to make loading them on the fly easier
• Simplify converter logic for smoother starting/stopping
• Improved UI for timer/status updates
• Remove double-duty variables from BBP_Converter and response data
• Switch from text-only response value to JSON object for improved flexibility

This allows the converter to return more data, and makes it easier to work with that data.

Todo:

• Error responses
• Check that starts are bumping correctly inside of steps
• Better utilize JSON responses

Location:

trunk/src

Files:

• bbpress.php (modified) (2 diffs)
• includes/admin/actions.php (modified) (3 diffs)
• includes/admin/admin.php (deleted)
• includes/admin/assets/css/admin.css (modified) (1 diff)
• includes/admin/assets/js/converter.js (modified) (10 diffs)
• includes/admin/classes/class-bbp-admin.php (added)
• includes/admin/classes/class-bbp-converter-base.php (modified) (26 diffs)
• includes/admin/classes/class-bbp-converter.php (modified) (28 diffs)
• includes/admin/tools/converter.php (modified) (2 diffs)
• includes/core/abstraction.php (modified) (1 diff)
• includes/users/functions.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -204 +204 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.6-rc-6595';
+        $this->version    = '2.6-rc-6601';
         $this->db_version = '262';
 
@@ -375 +375 @@
         // Quick admin check and load if needed
         if ( is_admin() ) {
-            require $this->includes_dir . 'admin/admin.php';
             require $this->includes_dir . 'admin/actions.php';
         }

trunk/src/includes/admin/actions.php

@@ -11 +11 @@
  *
  *  - bbPress: In {@link bbPress::setup_actions()} in bbpress.php
- *  - Admin: More in {@link BBP_Admin::setup_actions()} in admin.php
+ *  - Admin: More in {@link BBP_Admin::setup_actions()} in class-bbp-admin.php
  *
  * @package bbPress
@@ -62 +62 @@
 
 // Initialize the admin area
-add_action( 'bbp_init', 'bbp_admin' );
+add_action( 'bbp_init', 'bbp_setup_admin' );
 
 // Reset the menu order
@@ -106 +106 @@
 add_filter( 'bbp_admin_replies_column_headers', 'bbp_filter_column_headers' );
 
+// Load the converter early (page and AJAX)
+add_action( 'load-tools_page_bbp-converter', 'bbp_setup_converter', 2 );
+add_action( 'wp_ajax_bbp_converter_process', 'bbp_setup_converter', 2 );
+
+/**
+ * Setup bbPress admin
+ *
+ * @since 2.0.0 bbPress (r1000)
+ * @since 2.6.0 bbPress (r6598) Moved to actions.php
+ */
+function bbp_admin() {
+    return bbp_setup_admin();
+}
+
 /**
  * When a new site is created in a multisite installation, run the activation

trunk/src/includes/admin/assets/css/admin.css

@@ -366 +366 @@
 }
 
-#bbp-converter-timer {
-    position: absolute;
-    right: 10px;
-    top: 4px;
-    padding: 5px;
-    border: 1px solid #ddd;
-    background-color: #fafafa;
+#bbp-converter-status {
+    font-weight: 400;
+    font-size: 12px;
+    color: #aaa;
+    display: block;
+    margin-top: 2px;
 }
 

trunk/src/includes/admin/assets/js/converter.js

@@ -9 +9 @@
         start    = $( '#bbp-converter-start'    ),
         restart  = $( '#_bbp_converter_restart' ),
-        timer    = $( '#bbp-converter-timer'    ),
-        settings = $( '#bbp-converter-settings' ),
-
-        // Prefetch the settings
-        options  = bbp_converter_settings();
+        status   = $( '#bbp-converter-status'   ),
+        settings = $( '#bbp-converter-settings' );
 
     /**
@@ -24 +21 @@
     start.on( 'click', function( e ) {
         bbp_converter_user_start();
-
         e.preventDefault();
     } );
@@ -37 +33 @@
     $( stop ).on( 'click', function( e ) {
         bbp_converter_user_stop();
-
         e.preventDefault();
     } );
@@ -49 +44 @@
      */
     function bbp_converter_user_start() {
-        if ( ! BBP_Converter.running ) {
-            message.addClass( 'started' );
-            start.hide();
-            stop.show();
-
-            if ( BBP_Converter.started ) {
-                bbp_converter_log( BBP_Converter.strings.start_continue );
-            } else {
-                bbp_converter_log( BBP_Converter.strings.start_start );
-            }
-
-            bbp_converter_next();
-        }
-
-        BBP_Converter.started = true;
+        bbp_converter_start();
     }
 
@@ -81 +62 @@
 
     /**
-     * Database error
-     *
-     * @since 2.6.0 bbPress (r6470)
-     *
-     * @returns {void}
-     */
-    function bbp_converter_error_db() {
-        bbp_converter_stop(
-            BBP_Converter.strings.button_start,
-            BBP_Converter.strings.import_error_db
-        );
-    }
-
-    /**
-     * Converter error
-     *
-     * @since 2.6.0 bbPress (r6470)
-     *
-     * @returns {void}
-     */
-    function bbp_converter_halt() {
-        bbp_converter_stop(
-            BBP_Converter.strings.button_continue,
-            BBP_Converter.strings.import_error_halt
-        );
-    }
-
-    /**
-     * Converter complete
-     *
-     * @since 2.6.0 bbPress (r6470)
-     *
-     * @returns {void}
-     */
-    function bbp_converter_complete() {
-        bbp_converter_stop(
-            BBP_Converter.strings.button_start,
-            BBP_Converter.strings.import_comelete
-        );
-
-        BBP_Converter.started = false;
-    }
-
-    /**
-     * Handle successful ajax response
-     *
-     * @since 2.6.0 bbPress (r6470)
-     *
-     * @param {object} response Ajax response
-     *
-     * @returns {void}
-     */
-    function bbp_converter_process( response ) {
-        bbp_converter_log( response );
-
-        if ( response === BBP_Converter.strings.import_complete ) {
-            bbp_converter_complete();
-
-        } else if ( BBP_Converter.running ) {
-            bbp_converter_next();
-
-        } else if ( BBP_Converter.halt ) {
-            bbp_converter_halt();
-        }
-    }
-
-    /**
      * Return values of converter settings
      *
@@ -166 +80 @@
 
         if ( values['_bbp_converter_delay_time'] ) {
-            BBP_Converter.delay = values['_bbp_converter_delay_time'] * 1000;
+            BBP_Converter.delay = parseInt( values['_bbp_converter_delay_time'], 10 ) * 1000;
         }
 
@@ -182 +96 @@
      * @returns {void}
      */
-    function bbp_converter_step() {
-
+    function bbp_converter_post() {
+        $.post( ajaxurl, bbp_converter_settings(), function( response ) {
+
+            // Parse the json response
+            try {
+                var data = response.data;
+
+                // Success
+                if ( true === response.success ) {
+                    bbp_converter_step( data );
+
+                // Failure
+                } else {
+                    bbp_converter_stop();
+                }
+
+            } catch( e ) {
+                bbp_converter_stop();
+            }
+        }, 'json' );
+    }
+
+    /**
+     * Process the next step
+     *
+     * @since 2.6.0 bbPress (r6600)
+     *
+     * @param {object} data
+     * @returns {void}
+     */
+    function bbp_converter_step( data ) {
+
+        // Bail if not running
         if ( ! BBP_Converter.running ) {
             return;
         }
 
-        // Check if the settings have changed
-        options = bbp_converter_settings();
-
-        $.post( ajaxurl, options, function( response ) {
-
-            if ( 'bbp_converter_db_connection_failed' === response ) {
-                bbp_converter_error_db();
-                return;
-            }
-
-            bbp_converter_process( response.substring( 0, response.length - 1 ) );
-        } );
-    }
-
-    /**
-     * Proceed to the next converter step
-     *
-     * @since 2.6.0 bbPress (r6470)
-     *
-     * @returns {void}
-     */
-    function bbp_converter_next() {
-        bbp_converter_timer();
-
+        // Do the step
+        bbp_converter_log( data.progress );
+        bbp_converter_status( data );
+        bbp_converter_wait();
+
+        // Done
+        if ( data.current_step === data.final_step ) {
+            bbp_converter_stop(
+                BBP_Converter.strings.button_start,
+                BBP_Converter.strings.import_complete
+            );
+        }
+    }
+
+    /**
+     * Wait to do the next AJAX request
+     *
+     * @since 2.6.0 bbPress (r6600)
+     *
+     * @returns {void}
+     */
+    function bbp_converter_wait() {
         clearTimeout( BBP_Converter.running );
 
+        // Bail if not running
+        if ( ! BBP_Converter.running ) {
+            return;
+        }
+
+        // Wait, then POST
         BBP_Converter.running = setTimeout( function() {
-            bbp_converter_step();
-        }, BBP_Converter.delay );
+            bbp_converter_post();
+        }, parseInt( BBP_Converter.delay, 10 ) );
+    }
+
+    /**
+     * Start the converter and set the various flags
+     *
+     * @since 2.6.0 bbPress (r6600)
+     *
+     * @returns {void}
+     */
+    function bbp_converter_start() {
+        clearTimeout( BBP_Converter.running );
+        clearInterval( BBP_Converter.status );
+
+        BBP_Converter.running = true;
+
+        var log = BBP_Converter.strings.start_continue;
+        if ( BBP_Converter.started ) {
+            log = BBP_Converter.strings.start_start;
+            BBP_Converter.started = true;
+        }
+
+        bbp_converter_update(
+            BBP_Converter.strings.button_continue,
+            log,
+            BBP_Converter.strings.status_starting
+        );
+
+        message.addClass( 'started' );
+        start.hide();
+        stop.show();
+
+        bbp_converter_post();
     }
 
@@ -230 +211 @@
      */
     function bbp_converter_stop( button, log ) {
-        start.val( button ).show();
+        clearTimeout( BBP_Converter.running );
+        clearInterval( BBP_Converter.status );
+
+        BBP_Converter.running = false;
+        BBP_Converter.status  = false;
+
+        if ( ! button ) {
+            button = BBP_Converter.strings.button_continue;
+        }
+
+        if ( ! log ) {
+            log = BBP_Converter.strings.status_stopped;
+        }
+
+        bbp_converter_update(
+            button,
+            log,
+            BBP_Converter.strings.status_stopped
+        );
+
+        start.show();
         stop.hide();
-        timer.text( BBP_Converter.strings.timer_stopped );
-
-        if ( log ) {
-            bbp_converter_log( log );
-        }
-
-        clearTimeout( BBP_Converter.running );
-
-        BBP_Converter.running = false;
-    }
-
-    /**
-     * Update the timer
+    }
+
+    /**
+     * Update the various screen texts
+     *
+     * @since 2.6.0 bbPress (r6600)
+     *
+     * @param {string} b_text
+     * @param {string} p_text
+     * @param {string} s_text
+     *
+     * @returns {void}
+     */
+    function bbp_converter_update( b_text, p_text, s_text ) {
+        start.val( b_text );
+        bbp_converter_log( p_text );
+        status.text( s_text );
+    }
+
+    /**
+     * Update the status
      *
      * @since 2.6.0 bbPress (r6513)
@@ -250 +259 @@
      * @returns {void}
      */
-    function bbp_converter_timer() {
-        var remaining = BBP_Converter.delay / 1000;
-
-        timer.text( BBP_Converter.strings.timer_counting.replace( '%s', remaining ) );
-
-        clearInterval( BBP_Converter.timer );
-
-        BBP_Converter.timer = setInterval( function() {
+    function bbp_converter_status( data ) {
+        var remaining = parseInt( BBP_Converter.delay, 10 ) / 1000,
+            step      = parseInt( data.current_step,   10 ) + 1;
+
+        status.text( BBP_Converter.strings.status_counting.replace( '%s', remaining ) );
+        clearInterval( BBP_Converter.status );
+
+        BBP_Converter.status = setInterval( function() {
             remaining--;
-            timer.text( BBP_Converter.strings.timer_counting.replace( '%s', remaining ) );
+            status.text( BBP_Converter.strings.status_counting.replace( '%s', remaining ) );
 
             if ( remaining <= 0 ) {
-                clearInterval( BBP_Converter.timer );
-                timer.text( BBP_Converter.strings.timer_waiting );
+                clearInterval( BBP_Converter.status );
+
+                if ( parseInt( data.current_step, 10 ) < parseInt( data.final_step, 10 ) ) {
+                    status.text( BBP_Converter.strings.status_up_next.replace( '%s', step ) );
+                } else {
+                    status.text( BBP_Converter.strings.status_complete );
+                }
             }
         }, 1000 );
@@ -278 +292 @@
      */
     function bbp_converter_log( text ) {
-
-        if ( '<div' !== text.substring( 0, 3 ) ) {
-            text = '<p>' + text + '</p>';
-        }
+        text = '<p>' + text + '</p>';
 
         message.prepend( text );

trunk/src/includes/admin/classes/class-bbp-converter-base.php

@@ -13 +13 @@
 defined( 'ABSPATH' ) || exit;
 
+if ( ! class_exists( 'BBP_Converter_Base' ) ) :
 /**
  * Base class to be extended by specific individual importers
@@ -85 +86 @@
     public $convert_users = false;
 
+    /**
+     * @var bool Whether to clean up any old converter data. Default false.
+     */
+    public $clean = false;
+
     /** Methods ***************************************************************/
 
@@ -103 +109 @@
         /** Sanitize Options **************************************************/
 
+        $this->clean         = ! empty( $_POST['_bbp_converter_clean'] );
         $this->convert_users = (bool) get_option( '_bbp_converter_convert_users', false );
+        $this->halt          = (bool) get_option( '_bbp_converter_halt',          0     );
         $this->max_rows      = (int)  get_option( '_bbp_converter_rows',          100   );
 
@@ -133 +141 @@
         // Connection failed
         if ( ! $this->opdb->db_connect( false ) ) {
-            wp_die( 'bbp_converter_db_connection_failed', esc_html__( 'Database connection failed.', 'bbpress' ) );
+            $error = new WP_Error( 'bbp_converter_db_connection_failed', esc_html__( 'Database connection failed.', 'bbpress' ) );
+            wp_send_json_error( $error );
         }
 
@@ -140 +149 @@
 
         /**
-         * Error Reporting
+         * Don't wp_die() uncontrollably
          */
-        $this->wpdb->show_errors();
-        $this->opdb->show_errors();
+        $this->wpdb->show_errors( false );
+        $this->opdb->show_errors( false );
 
         /**
@@ -624 +633 @@
      */
     public function convert_forum_parents( $start = 1 ) {
-
         $has_update = false;
-
-        if ( ! empty( $this->sync_table ) ) {
-            $query = $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_forum_parent_id' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_forum_parent_id' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $forum_array = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $forum_array as $row ) {
+        $query      = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_forum_parent_id' )
+            : $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_forum_parent_id' );
+
+        foreach ( $this->get_results( $query ) as $row ) {
             $parent_id = $this->callback_forumid( $row->meta_value );
-            $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_parent = %d WHERE ID = %d LIMIT 1", $parent_id, $row->value_id ) );
+            $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_parent = %d WHERE ID = %d LIMIT 1", $parent_id, $row->value_id ) );
             $has_update = true;
         }
@@ -652 +653 @@
      */
     public function convert_topic_stickies( $start = 1 ) {
-
         $has_update = false;
-
-        if ( ! empty( $this->sync_table ) ) {
-            $query = $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'sticky' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'sticky' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $sticky_array = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $sticky_array as $row ) {
+        $query      = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'sticky' )
+            : $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'sticky' );
+
+        foreach ( $this->get_results( $query ) as $row ) {
             bbp_stick_topic( $row->value_id );
             $has_update = true;
@@ -679 +672 @@
      */
     public function convert_topic_super_stickies( $start = 1 ) {
-
         $has_update = false;
-
-        if ( ! empty( $this->sync_table ) ) {
-            $query = $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'super-sticky' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'super-sticky' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $sticky_array = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $sticky_array as $row ) {
+        $query      = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'super-sticky' )
+            : $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_sticky_status_id', 'super-sticky' );
+
+        foreach ( $this->get_results( $query ) as $row ) {
             $super = true;
             bbp_stick_topic( $row->value_id, $super );
@@ -707 +692 @@
      */
     public function convert_topic_closed_topics( $start = 1 ) {
-
         $has_update = false;
-
-        if ( ! empty( $this->sync_table ) ) {
-            $query = $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_closed_status_id', 'closed' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_closed_status_id', 'closed' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $closed_topic = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $closed_topic as $row ) {
+        $query      = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_closed_status_id', 'closed' )
+            : $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT {$start}, {$this->max_rows}", '_bbp_old_closed_status_id', 'closed' );
+
+        foreach ( $this->get_results( $query ) as $row ) {
             bbp_close_topic( $row->value_id );
             $has_update = true;
@@ -734 +711 @@
      */
     public function convert_reply_to_parents( $start = 1 ) {
-
         $has_update = false;
-
-        if ( ! empty( $this->sync_table ) ) {
-            $query = $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_reply_to_id' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_reply_to_id' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $reply_to_array = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $reply_to_array as $row ) {
+        $query      = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_reply_to_id' )
+            : $this->wpdb->prepare( "SELECT post_id AS value_id, meta_value FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value > 0 LIMIT {$start}, {$this->max_rows}", '_bbp_old_reply_to_id' );
+
+        foreach ( $this->get_results( $query ) as $row ) {
             $reply_to = $this->callback_reply_to( $row->meta_value );
-            $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->postmeta} SET meta_value = %s WHERE meta_key = %s AND post_id = %d LIMIT 1", $reply_to, '_bbp_reply_to', $row->value_id ) );
+            $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->postmeta} SET meta_value = %s WHERE meta_key = %s AND post_id = %d LIMIT 1", $reply_to, '_bbp_reply_to', $row->value_id ) );
             $has_update = true;
         }
@@ -781 +750 @@
                             AND wp_postmeta2.meta_key = %s
                             LIMIT {$start}, {$this->max_rows}", 'true', '_bbp_old_topic_author_name_id' );
-
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $anonymous_topics = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $anonymous_topics as $row ) {
+        }
+
+        foreach ( $this->get_results( $query ) as $row ) {
             $anonymous_topic_author_id = 0;
-            $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_author = %d WHERE ID = %d LIMIT 1", $anonymous_topic_author_id, $row->topic_id ) );
+            $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_author = %d WHERE ID = %d LIMIT 1", $anonymous_topic_author_id, $row->topic_id ) );
 
             add_post_meta( $row->topic_id, '_bbp_anonymous_name', $row->topic_author );
@@ -827 +791 @@
         }
 
-        update_option( '_bbp_converter_query', $query );
-
-        $anonymous_replies = $this->wpdb->get_results( $query );
-
-        foreach ( (array) $anonymous_replies as $row ) {
+        foreach ( $this->get_results( $query ) as $row ) {
             $anonymous_reply_author_id = 0;
-            $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_author = %d WHERE ID = %d LIMIT 1", $anonymous_reply_author_id, $row->reply_id ) );
+            $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->posts} SET post_author = %d WHERE ID = %d LIMIT 1", $anonymous_reply_author_id, $row->reply_id ) );
 
             add_post_meta( $row->reply_id, '_bbp_anonymous_name', $row->reply_author );
@@ -853 +813 @@
         /** Delete topics/forums/posts ****************************************/
 
-        if ( true === $this->sync_table ) {
-            $query = $this->wpdb->prepare( "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 = %s GROUP BY value_id ORDER BY value_id DESC LIMIT {$this->max_rows}", 'post' );
-        } else {
-            $query = $this->wpdb->prepare( "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 );
+        $query = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "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 = %s GROUP BY value_id ORDER BY value_id DESC LIMIT {$this->max_rows}", 'post' )
+            : $this->wpdb->prepare( "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}" );
+
+        $posts = $this->get_results( $query, ARRAY_A );
 
         if ( isset( $posts[0] ) && ! empty( $posts[0]['value_id'] ) ) {
@@ -872 +828 @@
         /** Delete users ******************************************************/
 
-        if ( true === $this->sync_table ) {
-            $query = $this->wpdb->prepare( "SELECT value_id FROM {$this->sync_table_name} INNER JOIN {$this->wpdb->users} ON(value_id = ID) WHERE meta_key = %s AND value_type = %s LIMIT {$this->max_rows}", '_bbp_old_user_id', 'user' );
-        } else {
-            $query = $this->wpdb->prepare( "SELECT user_id AS value_id FROM {$this->wpdb->usermeta} WHERE meta_key = %s LIMIT {$this->max_rows}", '_bbp_old_user_id' );
-        }
-
-        update_option( '_bbp_converter_query', $query );
-
-        $users = $this->wpdb->get_results( $query, ARRAY_A );
+        $query = ! empty( $this->sync_table )
+            ? $this->wpdb->prepare( "SELECT value_id FROM {$this->sync_table_name} INNER JOIN {$this->wpdb->users} ON(value_id = ID) WHERE meta_key = %s AND value_type = %s LIMIT {$this->max_rows}", '_bbp_old_user_id', 'user' )
+            : $this->wpdb->prepare( "SELECT user_id AS value_id FROM {$this->wpdb->usermeta} WHERE meta_key = %s LIMIT {$this->max_rows}", '_bbp_old_user_id' );
+
+        $users = $this->get_results( $query, ARRAY_A );
 
         if ( ! empty( $users ) ) {
@@ -901 +853 @@
      */
     public function clean_passwords( $start = 1 ) {
-
         $has_delete = false;
         $query      = $this->wpdb->prepare( "SELECT user_id, meta_value FROM {$this->wpdb->usermeta} WHERE meta_key = %s LIMIT {$start}, {$this->max_rows}", '_bbp_password' );
-
-        update_option( '_bbp_converter_query', $query );
-
-        $converted = $this->wpdb->get_results( $query, ARRAY_A );
+        $converted  = $this->get_results( $query, ARRAY_A );
 
         if ( ! empty( $converted ) ) {
@@ -913 +861 @@
             foreach ( $converted as $value ) {
                 if ( is_serialized( $value['meta_value'] ) ) {
-                    $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = '' WHERE ID = %d", $value['user_id'] ) );
+                    $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = '' WHERE ID = %d", $value['user_id'] ) );
                 } else {
-                    $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = %s WHERE ID = %d", $value['meta_value'], $value['user_id'] ) );
-                    $this->wpdb->query( $this->wpdb->prepare( "DELETE FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d", '_bbp_password', $value['user_id'] ) );
+                    $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = %s WHERE ID = %d", $value['meta_value'], $value['user_id'] ) );
+                    $this->query( $this->wpdb->prepare( "DELETE FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d", '_bbp_password', $value['user_id'] ) );
                 }
             }
@@ -944 +892 @@
     private function get_fields( $tablename ) {
         $rval        = array();
-        $field_array = $this->wpdb->get_results( 'DESCRIBE ' . $tablename, ARRAY_A );
+        $field_array = $this->get_results( 'DESCRIBE ' . $tablename, ARRAY_A );
 
         foreach ( $field_array as $field ) {
@@ -960 +908 @@
     }
 
+    /** Database Wrappers *****************************************************/
+
+    /**
+     * Update the last query option and return results
+     *
+     * @param string $query
+     * @param string $output
+     */
+    private function get_row( $query = '' ) {
+        update_option( '_bbp_converter_query', $query );
+
+        return $this->wpdb->get_row( $query );
+    }
+
+    /**
+     * Update the last query option and return results
+     *
+     * @param string $query
+     * @param string $output
+     */
+    private function get_results( $query = '', $output = OBJECT ) {
+        update_option( '_bbp_converter_query', $query );
+
+        return (array) $this->wpdb->get_results( $query, $output );
+    }
+
+    /**
+     * Update the last query option and do a general query
+     *
+     * @param string $query
+     */
+    private function query( $query = '' ) {
+        update_option( '_bbp_converter_query', $query );
+
+        return $this->wpdb->query( $query );
+    }
+
     /** Callbacks *************************************************************/
 
@@ -969 +954 @@
      */
     public function callback_pass( $username, $password ) {
-        $user = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT * FROM {$this->wpdb->users} WHERE user_login = %s AND user_pass = '' LIMIT 1", $username ) );
+        $user = $this->get_row( $this->wpdb->prepare( "SELECT * FROM {$this->wpdb->users} WHERE user_login = %s AND user_pass = '' LIMIT 1", $username ) );
         if ( ! empty( $user ) ) {
-            $usermeta = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT * FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d LIMIT 1", '_bbp_password', $user->ID ) );
+            $usermeta = $this->get_row( $this->wpdb->prepare( "SELECT * FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d LIMIT 1", '_bbp_password', $user->ID ) );
 
             if ( ! empty( $usermeta ) ) {
                 if ( $this->authenticate_pass( $password, $usermeta->meta_value ) ) {
-                    $this->wpdb->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = %s WHERE ID = %d", wp_hash_password( $password ), $user->ID ) );
-                    $this->wpdb->query( $this->wpdb->prepare( "DELETE FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d", '_bbp_password', $user->ID ) );
+                    $this->query( $this->wpdb->prepare( "UPDATE {$this->wpdb->users} SET user_pass = %s WHERE ID = %d", wp_hash_password( $password ), $user->ID ) );
+                    $this->query( $this->wpdb->prepare( "DELETE FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND user_id = %d", '_bbp_password', $user->ID ) );
                 }
             }
@@ -990 +975 @@
     private function callback_forumid( $field ) {
         if ( ! isset( $this->map_forumid[ $field ] ) ) {
-            if ( ! empty( $this->sync_table ) ) {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_forum_id', $field ) );
-            } else {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_forum_id', $field ) );
-            }
-
-            if ( ! is_null( $row ) ) {
-                $this->map_forumid[ $field ] = $row->value_id;
-            } else {
-                $this->map_forumid[ $field ] = 0;
-            }
-        }
+            $row = ! empty( $this->sync_table )
+                ? $this->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_forum_id', $field ) )
+                : $this->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_forum_id', $field ) );
+
+            $this->map_forumid[ $field ] = ! is_null( $row )
+                ? $row->value_id
+                : 0;
+        }
+
         return $this->map_forumid[ $field ];
     }
@@ -1013 +995 @@
     private function callback_topicid( $field ) {
         if ( ! isset( $this->map_topicid[ $field ] ) ) {
-            if ( ! empty( $this->sync_table ) ) {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_topic_id', $field ) );
-            } else {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_topic_id', $field ) );
-            }
-
-            if ( ! is_null( $row ) ) {
-                $this->map_topicid[ $field ] = $row->value_id;
-            } else {
-                $this->map_topicid[ $field ] = 0;
-            }
-        }
+            $row = ! empty( $this->sync_table )
+                ? $this->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_topic_id', $field ) )
+                : $this->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_topic_id', $field ) );
+
+            $this->map_topicid[ $field ] = ! is_null( $row )
+                ? $row->value_id
+                : 0;
+        }
+
         return $this->map_topicid[ $field ];
     }
@@ -1038 +1017 @@
     private function callback_reply_to( $field ) {
         if ( ! isset( $this->map_reply_to[ $field ] ) ) {
-            if ( ! empty( $this->sync_table ) ) {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_reply_id', $field ) );
-            } else {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_reply_id', $field ) );
-            }
-
-            if ( ! is_null( $row ) ) {
-                $this->map_reply_to[ $field ] = $row->value_id;
-            } else {
-                $this->map_reply_to[ $field ] = 0;
-            }
-        }
+            $row = ! empty( $this->sync_table )
+                ? $this->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_reply_id', $field ) )
+                : $this->get_row( $this->wpdb->prepare( "SELECT post_id AS value_id FROM {$this->wpdb->postmeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_reply_id', $field ) );
+
+            $this->map_reply_to[ $field ] = ! is_null( $row )
+                ? $row->value_id
+                : 0;
+        }
+
         return $this->map_reply_to[ $field ];
     }
@@ -1061 +1037 @@
     private function callback_userid( $field ) {
         if ( ! isset( $this->map_userid[ $field ] ) ) {
-            if ( ! empty( $this->sync_table ) ) {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_user_id', $field ) );
-            } else {
-                $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT user_id AS value_id FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_user_id', $field ) );
-            }
+            $row = ! empty( $this->sync_table )
+                ? $this->get_row( $this->wpdb->prepare( "SELECT value_id, meta_value FROM {$this->sync_table_name} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_user_id', $field ) )
+                : $this->get_row( $this->wpdb->prepare( "SELECT user_id AS value_id FROM {$this->wpdb->usermeta} WHERE meta_key = %s AND meta_value = %s LIMIT 1", '_bbp_old_user_id', $field ) );
 
             if ( ! is_null( $row ) ) {
                 $this->map_userid[ $field ] = $row->value_id;
             } else {
-                if ( true === $this->convert_users ) {
-                    $this->map_userid[ $field ] = 0;
-                } else {
-                    $this->map_userid[ $field ] = $field;
-                }
+                $this->map_userid[ $field ] = ( true === $this->convert_users )
+                    ? 0
+                    : $field;
             }
         }
+
         return $this->map_userid[ $field ];
     }
@@ -1089 +1062 @@
      */
     private function callback_check_anonymous( $field ) {
-
-        if ( $this->callback_userid( $field ) == 0 ) {
-            $field = 'true';
-        } else {
-            $field = 'false';
-        }
+        $field = ( $this->callback_userid( $field ) == 0 )
+            ? 'true'
+            : 'false';
 
         return $field;
@@ -1110 +1080 @@
             $this->map_topicid_to_forumid[ $topicid ] = 0;
         } elseif ( ! isset( $this->map_topicid_to_forumid[ $topicid ] ) ) {
-            $row = $this->wpdb->get_row( $this->wpdb->prepare( "SELECT post_parent FROM {$this->wpdb->posts} WHERE ID = %d LIMIT 1", $topicid ) );
-
-            if ( ! is_null( $row ) ) {
-                $this->map_topicid_to_forumid[ $topicid ] = $row->post_parent;
-            } else {
-                $this->map_topicid_to_forumid[ $topicid ] = 0;
-            }
+            $row = $this->get_row( $this->wpdb->prepare( "SELECT post_parent FROM {$this->wpdb->posts} WHERE ID = %d LIMIT 1", $topicid ) );
+
+            $this->map_topicid_to_forumid[ $topicid ] = ! is_null( $row )
+                ? $row->post_parent
+                : 0;
         }
 
@@ -1150 +1118 @@
     }
 }
+endif;

trunk/src/includes/admin/classes/class-bbp-converter.php

@@ -13 +13 @@
 defined( 'ABSPATH' ) || exit;
 
+if ( ! class_exists( 'BBP_Converter' ) ) :
 /**
  * Main BBP_Converter Class
@@ -49 +50 @@
 
     /**
+     * @var string Path to included platforms
+     */
+    public $converters_dir = '';
+
+    /**
      * The main bbPress Converter loader
      *
@@ -54 +60 @@
      */
     public function __construct() {
+        $this->setup_globals();
         $this->setup_actions();
+    }
+
+    /**
+     * Admin globals
+     *
+     * @since 2.6.0 bbPress (r6598)
+     */
+    public function setup_globals() {
+        $this->converters_dir = bbp_setup_admin()->admin_dir . 'converters/';
     }
 
@@ -86 +102 @@
             // Vars
             'ajax_nonce' => wp_create_nonce( 'bbp_converter_process' ),
-            'halt'       => (bool) defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY,
-            'started'    => (bool) get_option( '_bbp_converter_step',       false ),
-            'delay'      => (int)  get_option( '_bbp_converter_delay_time', 1     ),
+            'delay'      => (int)  get_option( '_bbp_converter_delay_time', 2 ),
             'running'    => false,
-            'complete'   => false,
-            'timer'      => false,
+            'status'     => false,
+            'started'    => (bool) get_option( '_bbp_converter_step', 0 ),
 
             // Strings
@@ -97 +111 @@
 
                 // Button text
-                'button_start'    => esc_html__( 'Start',    'bbpress' ),
-                'button_continue' => esc_html__( 'Continue', 'bbpress' ),
+                'button_start'        => esc_html__( 'Start',    'bbpress' ),
+                'button_continue'     => esc_html__( 'Continue', 'bbpress' ),
 
                 // Start button clicked
-                'start_start'    => esc_html__( 'Starting Import',   'bbpress' ),
-                'start_continue' => esc_html__( 'Continuing Import', 'bbpress' ),
+                'start_start'         => esc_html__( 'Starting Import...',   'bbpress' ),
+                'start_continue'      => esc_html__( 'Continuing Import...', 'bbpress' ),
 
                 // Import
-                'import_complete'     => esc_html__( 'Import Finished',            'bbpress' ),
-                'import_stopped_user' => esc_html__( 'Import Stopped (by User)',   'bbpress' ),
-                'import_error_db'     => esc_html__( 'Database Connection Failed', 'bbpress' ),
-                'import_error_halt'   => esc_html__( 'Import Halted (Error)',      'bbpress' ),
-
-                // Timer
-                'timer_stopped'       => esc_html__( 'Timer: Stopped',    'bbpress' ),
-                'timer_waiting'       => esc_html__( 'Timer: Waiting...', 'bbpress' ),
-                'timer_counting'      => esc_html__( 'Timer: %s',         'bbpress' )
+                'import_complete'     => esc_html__( 'Import Finished.',            'bbpress' ),
+                'import_stopped_user' => esc_html__( 'Import Stopped (by User.)',   'bbpress' ),
+                'import_error_halt'   => esc_html__( 'Import Halted (Error.)',      'bbpress' ),
+                'import_error_db'     => esc_html__( 'Database Connection Failed.', 'bbpress' ),
+
+                // Status
+                'status_complete'     => esc_html__( 'Finished',            'bbpress' ),
+                'status_stopped'      => esc_html__( 'Stopped',             'bbpress' ),
+                'status_starting'     => esc_html__( 'Starting',            'bbpress' ),
+                'status_up_next'      => esc_html__( 'Up next: Step %s...', 'bbpress' ),
+                'status_counting'     => esc_html__( 'Next in %s...',       'bbpress' )
             )
         ) );
@@ -138 +154 @@
 
     /**
-     * Wrap the converter output in paragraph tags, so styling can be applied
+     * Wrap the converter output in HTML, so styling can be applied
      *
      * @since 2.1.0 bbPress (r4052)
@@ -144 +160 @@
      * @param string $output
      */
-    private function converter_output( $output = '' ) {
-
-        // Maybe include last query
-        $query = get_option( '_bbp_converter_query' );
-        if ( ! empty( $query ) ) {
-            $output = $output . '<span class="query">' . esc_attr( $query ) . '</span>';
-        }
+    private function converter_response( $output = '' ) {
 
         // Maybe prepend the step
-        $step = ! empty( $this->step )
-            ? sprintf( '<span class="step">%s:</span> ', $this->step )
-            : '';
+        $output = ! empty( $this->step )
+            ? sprintf( '<span class="step">%s:</span> %s', $this->step, $output )
+            : $output;
 
         // Output
-        echo $step . $output;
+        wp_send_json_success( array(
+            'query'        => get_option( '_bbp_converter_query', '' ),
+            'current_step' => $this->step,
+            'final_step'   => $this->max_steps,
+            'progress'     => $output
+        ) );
     }
 
@@ -202 +217 @@
             '_bbp_converter_start' => 0,
 
+            // Halt
+            '_bbp_converter_halt' => ! empty( $_POST['_bbp_converter_halt'] )
+                ? (int) $_POST['_bbp_converter_halt']
+                : 0,
+
             // Rows
             '_bbp_converter_rows' => ! empty( $_POST['_bbp_converter_rows'] )
@@ -322 +342 @@
      */
     private function bump_step() {
-        update_option( '_bbp_converter_step',  $this->step + 1 );
-        update_option( '_bbp_converter_start', 0               );
+
+        // Start at zero
+        update_option( '_bbp_converter_start', 0 );
+
+        // Don't let step go over max
+        $step = ( ( $this->step + 1 ) <= $this->max_steps )
+            ? (int) $this->step + 1
+            : 0;
+
+        // Update or delete
+        ! empty( $step )
+            ? update_option( '_bbp_converter_step', $step )
+            : delete_option( '_bbp_converter_step' );
     }
 
@@ -444 +475 @@
      */
     private function step_sync_table() {
-        if ( ! empty( $_POST['_bbp_converter_clean'] ) ) {
+        if ( true === $this->converter->clean ) {
             if ( $this->converter->clean( $this->start ) ) {
+                $this->bump_step();
                 $this->sync_table( true );
-                $this->bump_step();
 
                 if ( empty( $this->start ) ) {
-                    $this->converter_output( esc_html__( 'Recreating sync-table', 'bbpress' ) );
+                    $this->converter_response( esc_html__( 'Recreating sync-table', 'bbpress' ) );
                 }
             } else {
-                $this->converter_output( sprintf( esc_html__( 'Deleting previously converted data (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
                 $this->bump_start();
-            }
-        } else {
-            $this->converter_output( esc_html__( 'Skipping sync-table clean-up', 'bbpress' ) );
+                $this->converter_response( sprintf( esc_html__( 'Deleting previously converted data (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+            }
+
+            $this->converter->clean = false;
+        } else {
+            $this->bump_step();
             $this->sync_table( false );
-            $this->bump_step();
+            $this->converter_response( esc_html__( 'Skipping sync-table clean-up', 'bbpress' ) );
         }
     }
@@ -474 +507 @@
 
                 if ( empty( $this->start ) ) {
-                    $this->converter_output( esc_html__( 'No users to import', 'bbpress' ) );
+                    $this->converter_response( esc_html__( 'No users to import', 'bbpress' ) );
                 }
             } else {
                 $this->bump_start();
-                $this->converter_output( sprintf(  esc_html__( 'Converting users (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
-            }
-        } else {
-            $this->bump_step();
-            $this->converter_output( esc_html__( 'Skipping user clean-up', 'bbpress' ) );
+                $this->converter_response( sprintf(  esc_html__( 'Converting users (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+            }
+        } else {
+            $this->bump_step();
+            $this->converter_response( esc_html__( 'Skipping user clean-up', 'bbpress' ) );
         }
     }
@@ -497 +530 @@
 
                 if ( empty( $this->start ) ) {
-                    $this->converter_output( esc_html__( 'No passwords to clear', 'bbpress' ) );
+                    $this->converter_response( esc_html__( 'No passwords to clear', 'bbpress' ) );
                 }
             } else {
                 $this->bump_start();
-                $this->converter_output( sprintf( esc_html__( 'Delete users WordPress default passwords (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
-            }
-        } else {
-            $this->bump_step();
-            $this->converter_output( esc_html__( 'Skipping password clean-up', 'bbpress' ) );
+                $this->converter_response( sprintf( esc_html__( 'Delete users WordPress default passwords (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+            }
+        } else {
+            $this->bump_step();
+            $this->converter_response( esc_html__( 'Skipping password clean-up', 'bbpress' ) );
         }
     }
@@ -519 +552 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No forums to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting forums (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No forums to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting forums (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -537 +570 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No forum parents to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Calculating forum hierarchy (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No forum parents to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Calculating forum hierarchy (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -555 +588 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No forum subscriptions to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting forum subscriptions (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No forum subscriptions to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting forum subscriptions (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -573 +606 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No topics to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting topics (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No topics to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting topics (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -591 +624 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No anonymous topic authors to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting anonymous topic authors (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No anonymous topic authors to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting anonymous topic authors (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -609 +642 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No stickies to stick', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Calculating topic stickies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No stickies to stick', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Calculating topic stickies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -627 +660 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No super stickies to stick', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Calculating topic super stickies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No super stickies to stick', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Calculating topic super stickies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -645 +678 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No closed topics to close', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Calculating closed topics (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No closed topics to close', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Calculating closed topics (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -663 +696 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No topic tags to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting topic tags (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No topic tags to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting topic tags (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -681 +714 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No topic subscriptions to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting topic subscriptions (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No topic subscriptions to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting topic subscriptions (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -699 +732 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No favorites to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting favorites (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No favorites to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting favorites (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -717 +750 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No replies to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting replies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No replies to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting replies (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -735 +768 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No anonymous reply authors to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Converting anonymous reply authors (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No anonymous reply authors to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Converting anonymous reply authors (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -753 +786 @@
 
             if ( empty( $this->start ) ) {
-                $this->converter_output( esc_html__( 'No threaded replies to import', 'bbpress' ) );
-            }
-        } else {
-            $this->bump_start();
-            $this->converter_output( sprintf( esc_html__( 'Calculating threaded replies parents (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
+                $this->converter_response( esc_html__( 'No threaded replies to import', 'bbpress' ) );
+            }
+        } else {
+            $this->bump_start();
+            $this->converter_response( sprintf( esc_html__( 'Calculating threaded replies parents (%1$s - %2$s)', 'bbpress' ), $this->min, $this->max ) );
         }
     }
@@ -768 +801 @@
     private function step_done() {
         $this->reset();
-        $this->converter_output( esc_html__( 'Import Finished', 'bbpress' ) );
+        $this->converter_response( esc_html__( 'Import Finished', 'bbpress' ) );
     }
 
@@ -826 +859 @@
     }
 }
+endif;

trunk/src/includes/admin/tools/converter.php

@@ -24 +24 @@
     // Default
     $files  = array();
-    $path   = bbpress()->admin->admin_dir . 'converters/';
+    $path   = bbp_setup_converter()->converters_dir;
     $curdir = opendir( $path );
 
@@ -67 +67 @@
     // Create a new converter object if it's found
     if ( isset( $converters[ $platform ] ) ) {
+
+        // Include & create the converter
         require_once $converters[ $platform ];
-        return new $platform;
+        if ( class_exists( $platform ) ) {
+            return new $platform;
+        }
     }
 

trunk/src/includes/core/abstraction.php

@@ -16 +16 @@
 // Exit if accessed directly
 defined( 'ABSPATH' ) || exit;
+
+/**
+ * Setup Admin
+ *
+ * This exists outside of "/includes/admin/" because the converter may need to
+ * be setup to convert the passwords of users that were migrated from another
+ * forum platform.
+ *
+ * @since 2.6.0 bbPress (r2596)
+ */
+function bbp_setup_admin() {
+    $bbp = bbpress();
+
+    // Skip if already setup
+    if ( empty( $bbp->admin ) ) {
+
+        // Require the admin class
+        require_once $bbp->includes_dir . 'admin/classes/class-bbp-admin.php';
+
+        // Setup
+        $bbp->admin = class_exists( 'BBP_Admin' )
+            ? new BBP_Admin()
+            : new stdClass();
+    }
+
+    // Return the admin object
+    return $bbp->admin;
+}
+
+/**
+ * Setup Converter
+ *
+ * This exists outside of "/includes/admin/" because the converter may need to
+ * be setup to convert the passwords of users that were migrated from another
+ * forum platform.
+ *
+ * @since 2.6.0 bbPress (r2596)
+ */
+function bbp_setup_converter() {
+    $bbp_admin = bbp_setup_admin();
+
+    // Skip if already setup
+    if ( empty( $bbp_admin->converter ) ) {
+
+        // Require the converter classes
+        require_once $bbp_admin->admin_dir . 'classes/class-bbp-converter-base.php';
+        require_once $bbp_admin->admin_dir . 'classes/class-bbp-converter.php';
+
+        // Setup
+        $bbp_admin->converter = class_exists( 'BBP_Converter' )
+            ? new BBP_Converter()
+            : new stdClass();
+    }
+
+    // Return the converter
+    return $bbp_admin->converter;
+}
 
 /**

trunk/src/includes/users/functions.php

@@ -984 +984 @@
     }
 
-    // Setup admin (to include converter)
-    require_once bbpress()->includes_dir . 'admin/admin.php';
-
-    // Create the admin object
-    bbp_admin();
-
-    // Convert password
-    require_once bbpress()->admin->admin_dir . 'converter.php';
-    require_once bbpress()->admin->admin_dir . 'converters/' . sanitize_key( $row->meta_value ) . '.php';
-
-    // Create the converter
+    // Try to convert the old password for this user
     $converter = bbp_new_converter( $row->meta_value );