Changeset 6514

Timestamp:

06/09/2017 10:34:16 PM (9 years ago)

Author:

johnjamesjacoby

Message:

Converter: Port changes proposed for 2.7 in for 2.6:

• Add a timer UI to show the count down until the next step
• Move converter settings into the normal options & settings arrays
• Update fields, sections, & pages as needed
• Update converter.js version to use bbp_get_version()
• Make connection & options persistent across requests whenever possible, and trust the settings if settings change
• Split steps up into private methods, out of the massive do_steps() method

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/admin/admin.php (modified) (5 diffs)
• includes/admin/assets/css/admin.css (modified) (1 diff)
• includes/admin/assets/js/converter.js (modified) (5 diffs)
• includes/admin/classes/class-bbp-converter-base.php (modified) (6 diffs)
• includes/admin/classes/class-bbp-converter.php (modified) (10 diffs)
• includes/admin/settings.php (modified) (21 diffs)
• includes/core/options.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -205 +205 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.6-rc-6509';
+        $this->version    = '2.6-rc-6513';
         $this->db_version = '261';
 

trunk/src/includes/admin/admin.php

@@ -369 +369 @@
             }
 
-            // Toggle the section if core integration is on
-            if ( ( 'deep' === $settings_integration ) && ! empty( $section['page'] ) ) {
+            // Overload the converter page
+            if ( ! empty( $section['page'] ) && ( ( 'converter' === $section['page'] ) || ( 'deep' === $settings_integration ) ) ) {
                 $page = $section['page'];
             } else {
@@ -412 +412 @@
         switch ( $cap ) {
 
-            // BuddyPress
-            case 'bbp_settings_buddypress' :
-                if ( ( is_plugin_active( 'buddypress/bp-loader.php' ) && defined( 'BP_VERSION' ) && bp_is_root_blog() ) && is_super_admin() ) {
-                    $caps = array( bbpress()->admin->minimum_capability );
-                } else {
-                    $caps = array( 'do_not_allow' );
-                }
-
-                break;
-
-            // Akismet
-            case 'bbp_settings_akismet' :
-                if ( ( is_plugin_active( 'akismet/akismet.php' ) && defined( 'AKISMET_VERSION' ) ) && is_super_admin() ) {
-                    $caps = array( bbpress()->admin->minimum_capability );
-                } else {
-                    $caps = array( 'do_not_allow' );
-                }
-
-                break;
-
-            // bbPress
+            // Pages
             case 'bbp_about_page'            : // About and Credits
             case 'bbp_tools_page'            : // Tools Page
@@ -440 +420 @@
             case 'bbp_tools_reset_page'      : // Tools - Reset Page
             case 'bbp_settings_page'         : // Settings Page
+
+            // Converter Sections
+            case 'bbp_converter_connection'  : // Converter - Connection
+            case 'bbp_converter_options'     : // Converter - Options
+
+            // Settings Sections
             case 'bbp_settings_users'        : // Settings - Users
             case 'bbp_settings_features'     : // Settings - Features
@@ -450 +436 @@
                 $caps = array( bbpress()->admin->minimum_capability );
                 break;
+
+            // Extend - BuddyPress
+            case 'bbp_settings_buddypress' :
+                if ( ( is_plugin_active( 'buddypress/bp-loader.php' ) && defined( 'BP_VERSION' ) && bp_is_root_blog() ) && is_super_admin() ) {
+                    $caps = array( bbpress()->admin->minimum_capability );
+                } else {
+                    $caps = array( 'do_not_allow' );
+                }
+
+                break;
+
+            // Extend - Akismet
+            case 'bbp_settings_akismet' :
+                if ( ( is_plugin_active( 'akismet/akismet.php' ) && defined( 'AKISMET_VERSION' ) ) && is_super_admin() ) {
+                    $caps = array( bbpress()->admin->minimum_capability );
+                } else {
+                    $caps = array( 'do_not_allow' );
+                }
+
+                break;
         }
 
@@ -564 +570 @@
     public function enqueue_scripts() {
 
-        // Enqueue suggest for forum/topic/reply autocmopletes
+        // Enqueue suggest for forum/topic/reply autocompletes
         wp_enqueue_script( 'suggest' );
 

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

@@ -361 +361 @@
     display: none;
 }
+
+#bbp-converter-timer {
+    position: absolute;
+    right: 10px;
+    top: 4px;
+    padding: 5px;
+    border: 1px solid #ddd;
+    background-color: #fafafa;
+}

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

@@ -9 +9 @@
         start    = $( '#bbp-converter-start'    ),
         restart  = $( '#_bbp_converter_restart' ),
-        settings = $( '#bbp-converter-settings' );
+        timer    = $( '#bbp-converter-timer'    ),
+        settings = $( '#bbp-converter-settings' ),
+
+        // Prefetch the settings
+        options  = bbp_converter_settings();
 
     /**
@@ -184 +188 @@
         }
 
-        $.post( ajaxurl, bbp_converter_settings(), function( response ) {
+        // Check if the settings have changed
+        options = bbp_converter_settings();
+
+        $.post( ajaxurl, options, function( response ) {
 
             if ( 'bbp_converter_db_connection_failed' === response ) {
@@ -203 +210 @@
      */
     function bbp_converter_next() {
+        bbp_converter_timer();
+
         clearTimeout( BBP_Converter.running );
 
@@ -223 +232 @@
         start.val( button ).show();
         stop.hide();
+        timer.text( BBP_Converter.strings.timer_stopped );
 
         if ( log ) {
@@ -234 +244 @@
 
     /**
+     * Update the timer
+     *
+     * @since 2.6.0 bbPress (r6513)
+     *
+     * @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() {
+            remaining--;
+            timer.text( BBP_Converter.strings.timer_counting.replace( '%s', remaining ) );
+
+            if ( remaining <= 0 ) {
+                clearInterval( BBP_Converter.timer );
+                timer.text( BBP_Converter.strings.timer_waiting );
+            }
+        }, 1000 );
+    }
+
+    /**
      * Prepend some text to the import monitor
      *

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

@@ -68 +68 @@
      * @var str This is the charset for your wp database.
      */
-    public $charset;
+    public $charset = '';
 
     /**
@@ -78 +78 @@
      * @var str Sync table name.
      */
-    public $sync_table_name;
+    public $sync_table_name = '';
 
     /**
@@ -103 +103 @@
         /** Sanitize Options **************************************************/
 
-        $this->convert_users = ! empty( $_POST['_bbp_converter_convert_users'] )
-            ? true
-            : false;
+        $this->convert_users = (bool) get_option( '_bbp_converter_convert_users', false );
+        $this->max_rows      = (int)  get_option( '_bbp_converter_rows',          100   );
 
         /** Sanitize Connection ***********************************************/
 
-        $db_user = ! empty( $_POST['_bbp_converter_db_user'] )
-            ? sanitize_text_field( $_POST['_bbp_converter_db_user'] )
-            : DB_USER;
-
-        $db_pass = ! empty( $_POST['_bbp_converter_db_pass'] )
-            ? sanitize_text_field( $_POST['_bbp_converter_db_pass'] )
-            : DB_PASSWORD;
-
-        $db_name = ! empty( $_POST['_bbp_converter_db_name'] )
-            ? sanitize_text_field( $_POST['_bbp_converter_db_name'] )
-            : DB_NAME;
-
-        $db_port = ! empty( $_POST['_bbp_converter_db_port'] )
-            ? (int) sanitize_text_field( $_POST['_bbp_converter_db_port'] )
-            : '';
-
-        $db_server = ! empty( $_POST['_bbp_converter_db_server'] )
-            ? sanitize_text_field( $_POST['_bbp_converter_db_server'] )
-            : DB_HOST;
-
-        $db_prefix = ! empty( $_POST['_bbp_converter_db_prefix'] )
-            ? sanitize_text_field( $_POST['_bbp_converter_db_prefix'] )
-            : '';
-
-        $db_rows = ! empty( $_POST['_bbp_converter_rows'] )
-            ? (int) $_POST['_bbp_converter_rows']
-            : 100;
+        $db_user   = get_option( '_bbp_converter_db_user',   DB_USER     );
+        $db_pass   = get_option( '_bbp_converter_db_pass',   DB_PASSWORD );
+        $db_name   = get_option( '_bbp_converter_db_name',   DB_NAME     );
+        $db_host   = get_option( '_bbp_converter_db_server', DB_HOST     );
+        $db_port   = get_option( '_bbp_converter_db_port',   ''          );
+        $db_prefix = get_option( '_bbp_converter_db_prefix', ''          );
 
         // Maybe add port to server
-        if ( ! empty( $db_port ) && ! empty( $db_server ) && ! strstr( $db_server, ':' ) ) {
-            $db_server = $db_server . ':' . $db_port;
+        if ( ! empty( $db_port ) && ! empty( $db_host ) && ! strstr( $db_host, ':' ) ) {
+            $db_host = $db_host . ':' . $db_port;
         }
 
@@ -145 +123 @@
 
         // Setup WordPress Database
-        $this->wpdb     = bbp_db();
-        $this->max_rows = $db_rows;
+        $this->wpdb = bbp_db();
 
         // Control WPDB db_connect() bailing
@@ -152 +129 @@
 
         // Setup old forum Database
-        $this->opdb = new wpdb( $db_user, $db_pass, $db_name, $db_server );
+        $this->opdb = new wpdb( $db_user, $db_pass, $db_name, $db_host );
 
         // Connection failed
@@ -172 +149 @@
          */
         $this->sync_table_name = $this->wpdb->prefix . 'bbp_converter_translator';
-        if ( $this->wpdb->get_var( "SHOW TABLES LIKE '" . $this->sync_table_name . "'" ) === $this->sync_table_name ) {
-            $this->sync_table = true;
-        } else {
-            $this->sync_table = false;
-        }
+        $this->sync_table      = $this->sync_table_name === $this->wpdb->get_var( "SHOW TABLES LIKE '{$this->sync_table_name}'" )
+            ? true
+            : false;
 
         /**
          * Character set
          */
-        if ( empty( $this->wpdb->charset ) ) {
-            $this->charset = 'UTF8';
-        } else {
-            $this->charset = $this->wpdb->charset;
-        }
+        $this->charset = ! empty( $this->wpdb->charset )
+            ? $this->wpdb->charset
+            : 'UTF8';
 
         /**

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

@@ -44 +44 @@
 
     /**
+     * @var int Maximum number of converter steps
+     */
+    public $max_steps = 17;
+
+    /**
      * The main bbPress Converter loader
      *
@@ -67 +72 @@
         add_action( 'admin_head-tools_page_bbp-converter', array( $this, 'admin_head' ) );
 
-        // Attach the bbConverter admin settings action to the WordPress admin init action.
-        add_action( 'load-tools_page_bbp-converter', array( $this, 'register_admin_settings' ) );
-
         // Attach to the admin ajax request to process cycles
         add_action( 'wp_ajax_bbp_converter_process', array( $this, 'process_callback' ) );
-    }
-
-    /**
-     * Register the settings
-     *
-     * @since 2.1.0 bbPress (r3813)
-     *
-     * @uses add_settings_section() To add our own settings section
-     * @uses add_settings_field() To add various settings fields
-     * @uses register_setting() To register various settings
-     */
-    public function register_admin_settings() {
-
-        // Add the main section
-        add_settings_section( 'bbpress_converter_main',     esc_html__( 'Database Settings', 'bbpress' ),  'bbp_converter_setting_callback_main_section', 'bbpress_converter' );
-
-        // System Select
-        add_settings_field( '_bbp_converter_platform',      esc_html__( 'Select Platform',   'bbpress' ),  'bbp_converter_setting_callback_platform', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_platform',           'sanitize_title' );
-
-        // Database Server
-        add_settings_field( '_bbp_converter_db_server',     esc_html__( 'Database Server',   'bbpress' ),  'bbp_converter_setting_callback_dbserver', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_server',          'sanitize_title' );
-
-        // Database Server Port
-        add_settings_field( '_bbp_converter_db_port',       esc_html__( 'Database Port',     'bbpress' ),  'bbp_converter_setting_callback_dbport', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_port',            'sanitize_title' );
-
-        // Database Name
-        add_settings_field( '_bbp_converter_db_name',       esc_html__( 'Database Name',     'bbpress' ),  'bbp_converter_setting_callback_dbname', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_name',            'sanitize_title' );
-
-        // Database User
-        add_settings_field( '_bbp_converter_db_user',       esc_html__( 'Database User',     'bbpress' ),  'bbp_converter_setting_callback_dbuser', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_user',            'sanitize_title' );
-
-        // Database Pass
-        add_settings_field( '_bbp_converter_db_pass',       esc_html__( 'Database Password', 'bbpress' ),  'bbp_converter_setting_callback_dbpass', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_pass',            'sanitize_title' );
-
-        // Database Prefix
-        add_settings_field( '_bbp_converter_db_prefix',     esc_html__( 'Table Prefix',      'bbpress' ),  'bbp_converter_setting_callback_dbprefix', 'bbpress_converter', 'bbpress_converter_main' );
-        register_setting  ( 'bbpress_converter_main',       '_bbp_converter_db_prefix',          'sanitize_title' );
-
-        // Add the options section
-        add_settings_section( 'bbpress_converter_opt',      esc_html__( 'Options',           'bbpress' ),  'bbp_converter_setting_callback_options_section', 'bbpress_converter' );
-
-        // Rows Limit
-        add_settings_field( '_bbp_converter_rows',          esc_html__( 'Rows Limit',        'bbpress' ),  'bbp_converter_setting_callback_rows', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_rows',               'intval' );
-
-        // Delay Time
-        add_settings_field( '_bbp_converter_delay_time',    esc_html__( 'Delay Time',        'bbpress' ), 'bbp_converter_setting_callback_delay_time', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_delay_time',        'intval' );
-
-        // Convert Users ?
-        add_settings_field( '_bbp_converter_convert_users', esc_html__( 'Convert Users',     'bbpress' ), 'bbp_converter_setting_callback_convert_users', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_convert_users',     'intval' );
-
-        // Restart
-        add_settings_field( '_bbp_converter_restart',       esc_html__( 'Start Over',        'bbpress' ), 'bbp_converter_setting_callback_restart', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_restart',           'intval' );
-
-        // Clean
-        add_settings_field( '_bbp_converter_clean',         esc_html__( 'Purge Previous Import', 'bbpress' ), 'bbp_converter_setting_callback_clean', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_clean',             'intval' );
     }
 
@@ -157 +93 @@
         wp_enqueue_script( 'postbox'   );
         wp_enqueue_script( 'dashboard' );
-        wp_enqueue_script( 'bbp-converter', $bbp->admin->js_url . 'converter' . $suffix . '.js', array( 'jquery', 'postbox' ), $bbp->asset_version );
+        wp_enqueue_script( 'bbp-converter', $bbp->admin->js_url . 'converter' . $suffix . '.js', array( 'jquery', 'postbox' ), $bbp->version );
 
         // Localize JS
@@ -165 +101 @@
             '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 ),
+            'started'    => (bool) get_option( '_bbp_converter_step',       false ),
+            'delay'      => (int)  get_option( '_bbp_converter_delay_time', 1     ),
             'running'    => false,
             'complete'   => false,
-            'delay'      => 0,
+            'timer'      => false,
 
             // Strings
@@ -187 +124 @@
                 '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' )
             )
         ) );
@@ -257 +199 @@
         // Save step and count so that it can be restarted.
         if ( ! get_option( '_bbp_converter_step' ) || ! empty( $_POST['_bbp_converter_restart'] ) ) {
-            update_option( '_bbp_converter_step',  0 );
-            update_option( '_bbp_converter_start', 0 );
-
-            $this->step  = 0;
+            $this->maybe_update_options();
+            $this->step  = 1;
             $this->start = 0;
         }
     }
 
+    private function maybe_update_options() {
+
+        // Get the default options & values
+        $defaults = bbp_get_default_options();
+
+        // Default options
+        $options = array(
+
+            // Step & Start
+            '_bbp_converter_step'  => 1,
+            '_bbp_converter_start' => 0,
+
+            // Rows
+            '_bbp_converter_rows' => ! empty( $_POST['_bbp_converter_rows'] )
+                ? (int) $_POST['_bbp_converter_rows']
+                : 0,
+
+            // Platform
+            '_bbp_converter_platform' => ! empty( $_POST['_bbp_converter_platform' ] )
+                ? sanitize_text_field( $_POST['_bbp_converter_platform' ] )
+                : '',
+
+            // Convert Users
+            '_bbp_converter_convert_users' => ! empty( $_POST['_bbp_converter_convert_users'] )
+                ? (bool) $_POST['_bbp_converter_convert_users']
+                : false,
+
+            // DB User
+            '_bbp_converter_db_user' => ! empty( $_POST['_bbp_converter_db_user'] )
+                ? sanitize_text_field( $_POST['_bbp_converter_db_user'] )
+                : '',
+
+            // DB Password
+            '_bbp_converter_db_pass' => ! empty( $_POST['_bbp_converter_db_pass'] )
+                ? sanitize_text_field( $_POST['_bbp_converter_db_pass'] )
+                : '',
+
+            // DB Name
+            '_bbp_converter_db_name' => ! empty( $_POST['_bbp_converter_db_name'] )
+                ? sanitize_text_field( $_POST['_bbp_converter_db_name'] )
+                : '',
+
+            // DB Server
+            '_bbp_converter_db_server' => ! empty( $_POST['_bbp_converter_db_server'] )
+                ? sanitize_text_field( $_POST['_bbp_converter_db_server'] )
+                : '',
+
+            // DB Port
+            '_bbp_converter_db_port' => ! empty( $_POST['_bbp_converter_db_port'] )
+                ? (int) sanitize_text_field( $_POST['_bbp_converter_db_port'] )
+                : '',
+
+            // DB Table Prefix
+            '_bbp_converter_db_prefix' => ! empty( $_POST['_bbp_converter_db_prefix'] )
+                ? sanitize_text_field( $_POST['_bbp_converter_db_prefix'] )
+                : ''
+        );
+
+        // Update/delete options
+        foreach ( $options as $key => $value ) {
+
+            // Default
+            $default = $defaults[ $key ];
+
+            // Update or save
+            ! empty( $value ) && ( $default !== $value )
+                ? update_option( $key, $value )
+                : delete_option( $key );
+        }
+    }
+
     /**
      * Setup converter options
@@ -272 +283 @@
     private function setup_options() {
 
-        // Get starting point
-        $this->step  = (int) get_option( '_bbp_converter_step',  1 );
-        $this->min   = (int) get_option( '_bbp_converter_start', 0 );
-
-        // Number of rows
-        $this->rows = ! empty( $_POST['_bbp_converter_rows'] )
-            ? (int) $_POST['_bbp_converter_rows']
-            : 100;
+        // Get starting point & rows
+        $this->step  = (int) get_option( '_bbp_converter_step',  1   );
+        $this->min   = (int) get_option( '_bbp_converter_start', 0   );
+        $this->rows  = (int) get_option( '_bbp_converter_rows',  100 );
 
         // Get boundaries
@@ -286 +293 @@
 
         // Look for platform
-        $platform = ! empty( $_POST['_bbp_converter_platform' ] )
-            ? sanitize_text_field( $_POST['_bbp_converter_platform' ] )
-            : get_option( '_bbp_converter_platform' );
+        $platform = get_option( '_bbp_converter_platform' );
 
         // Maybe include the appropriate converter.
@@ -354 +359 @@
         switch ( $this->step ) {
 
-            // STEP 1. Clean all tables.
+            // Clean all tables.
             case 1 :
-                if ( ! empty( $_POST['_bbp_converter_clean'] ) ) {
-                    if ( $this->converter->clean( $this->start ) ) {
-                        $this->sync_table( true );
-                        $this->bump_step();
-
-                        if ( empty( $this->start ) ) {
-                            $this->converter_output( 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->sync_table( false );
-                    $this->bump_step();
-                }
-
-                break;
-
-            // STEP 2. Convert users.
+                $this->step_sync_table();
+                break;
+
+            // Convert users.
             case 2 :
-                if ( true === $this->converter->convert_users ) {
-                    if ( $this->converter->convert_users( $this->start ) ) {
-                        $this->bump_step();
-
-                        if ( empty( $this->start ) ) {
-                            $this->converter_output( 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' ) );
-                }
-
-                break;
-
-            // STEP 3. Clean passwords.
+                $this->step_users();
+                break;
+
+            // Clean passwords.
             case 3 :
-                if ( true === $this->converter->convert_users ) {
-                    if ( $this->converter->clean_passwords( $this->start ) ) {
-                        $this->bump_step();
-
-                        if ( empty( $this->start ) ) {
-                            $this->converter_output( 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' ) );
-                }
-
-                break;
-
-            // STEP 4. Convert forums.
+                $this->step_passwords();
+                break;
+
+            // Convert forums.
             case 4 :
-                if ( $this->converter->convert_forums( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 5. Convert forum parents.
+                $this->step_forums();
+                break;
+
+            // Convert forum parents.
             case 5 :
-                if ( $this->converter->convert_forum_parents( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 6. Convert forum subscriptions.
+                $this->step_forum_hierarchy();
+                break;
+
+            // Convert forum subscriptions.
             case 6 :
-                if ( $this->converter->convert_forum_subscriptions( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 7. Convert topics.
+                $this->step_forum_subscriptions();
+                break;
+
+            // Convert topics.
             case 7 :
-                if ( $this->converter->convert_topics( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 8. Convert anonymous topic authors.
+                $this->step_topics();
+                break;
+
+            // Convert topic authors.
             case 8 :
-                if ( $this->converter->convert_anonymous_topic_authors( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 9. Stick topics.
+                $this->step_topics_authors();
+                break;
+
+            // Sticky topics.
             case 9 :
-                if ( $this->converter->convert_topic_stickies( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 10. Stick to front topics (Super Sicky).
+                $this->step_stickies();
+                break;
+
+            // Stick to front topics (Super Sicky).
             case 10 :
-                if ( $this->converter->convert_topic_super_stickies( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 11. Closed topics.
+                $this->step_super_stickies();
+                break;
+
+            // Closed topics.
             case 11 :
-                if ( $this->converter->convert_topic_closed_topics( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 12. Convert topic tags.
+                $this->step_closed_topics();
+                break;
+
+            // Convert topic tags.
             case 12 :
-                if ( $this->converter->convert_tags( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 13. Convert topic subscriptions.
+                $this->step_topic_tags();
+                break;
+
+            // Convert topic subscriptions.
             case 13 :
-                if ( $this->converter->convert_topic_subscriptions( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 14. Convert topic favorites.
+                $this->step_topic_subscriptions();
+                break;
+
+            // Convert topic favorites.
             case 14 :
-                if ( $this->converter->convert_favorites( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 15. Convert replies.
+                $this->step_topic_favorites();
+                break;
+
+            // Convert replies.
             case 15 :
-                if ( $this->converter->convert_replies( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 16. Convert anonymous reply authors.
+                $this->step_replies();
+                break;
+
+            // Convert reply authors.
             case 16 :
-                if ( $this->converter->convert_anonymous_reply_authors( $this->start ) ) {
-                    $this->bump_step();
-
-                    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 ) );
-                }
-
-                break;
-
-            // STEP 17. Convert threaded replies parents.
+                $this->step_reply_authors();
+                break;
+
+            // Convert threaded reply hierarchy.
             case 17 :
-                if ( $this->converter->convert_reply_to_parents( $this->start ) ) {
-                    $this->bump_step();
-
-                    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->step_reply_hierarchy();
                 break;
 
             // Done
             default :
-                $this->reset();
-                $this->converter_output( esc_html__( 'Import Finished', 'bbpress' ) );
-
-                break;
-        }
-    }
+                $this->step_done();
+                break;
+        }
+    }
+
+    /** Steps *****************************************************************/
+
+    /**
+     * Clean the sync table
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_sync_table() {
+        if ( ! empty( $_POST['_bbp_converter_clean'] ) ) {
+            if ( $this->converter->clean( $this->start ) ) {
+                $this->sync_table( true );
+                $this->bump_step();
+
+                if ( empty( $this->start ) ) {
+                    $this->converter_output( 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->sync_table( false );
+            $this->bump_step();
+        }
+    }
+
+    /**
+     * Maybe convert users
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_users() {
+        if ( true === $this->converter->convert_users ) {
+            if ( $this->converter->convert_users( $this->start ) ) {
+                $this->bump_step();
+
+                if ( empty( $this->start ) ) {
+                    $this->converter_output( 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' ) );
+        }
+    }
+
+    /**
+     * Maybe clean up passwords
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_passwords() {
+        if ( true === $this->converter->convert_users ) {
+            if ( $this->converter->clean_passwords( $this->start ) ) {
+                $this->bump_step();
+
+                if ( empty( $this->start ) ) {
+                    $this->converter_output( 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' ) );
+        }
+    }
+
+    /**
+     * Maybe convert forums
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_forums() {
+        if ( $this->converter->convert_forums( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe walk the forum hierarchy
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_forum_hierarchy() {
+        if ( $this->converter->convert_forum_parents( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert forum subscriptions
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_forum_subscriptions() {
+        if ( $this->converter->convert_forum_subscriptions( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert topics
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_topics() {
+        if ( $this->converter->convert_topics( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert topic authors (anonymous)
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_topics_authors() {
+        if ( $this->converter->convert_anonymous_topic_authors( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert sticky topics (not super stickies)
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_stickies() {
+        if ( $this->converter->convert_topic_stickies( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert super-sticky topics (not per-forum)
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_super_stickies() {
+        if ( $this->converter->convert_topic_super_stickies( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe close converted topics
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_closed_topics() {
+        if ( $this->converter->convert_topic_closed_topics( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert topic tags
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_topic_tags() {
+        if ( $this->converter->convert_tags( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert topic subscriptions
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_topic_subscriptions() {
+        if ( $this->converter->convert_topic_subscriptions( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert topic favorites
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_topic_favorites() {
+        if ( $this->converter->convert_favorites( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert replies
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_replies() {
+        if ( $this->converter->convert_replies( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert reply authors (anonymous)
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_reply_authors() {
+        if ( $this->converter->convert_anonymous_reply_authors( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Maybe convert the threaded reply hierarchy
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_reply_hierarchy() {
+        if ( $this->converter->convert_reply_to_parents( $this->start ) ) {
+            $this->bump_step();
+
+            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 ) );
+        }
+    }
+
+    /**
+     * Done!
+     *
+     * @since 2.6.0 bbPress (r6513)
+     */
+    private function step_done() {
+        $this->reset();
+        $this->converter_output( esc_html__( 'Import Finished', 'bbpress' ) );
+    }
+
+    /** Helper Table **********************************************************/
 
     /**
@@ -640 +793 @@
      * @since 2.1.0 bbPress (r3813)
      */
-    public function sync_table( $drop = false ) {
+    public static function sync_table( $drop = false ) {
 
         // Setup DB

trunk/src/includes/admin/settings.php

@@ -24 +24 @@
     // Filter & return
     return (array) apply_filters( 'bbp_admin_get_settings_sections', array(
+
+        // Settings
         'bbp_settings_users' => array(
             'title'    => esc_html__( 'Forum User Settings', 'bbpress' ),
@@ -64 +66 @@
             'page'     => 'permalink',
         ),
+
+        // Extend
         'bbp_settings_buddypress' => array(
             'title'    => esc_html__( 'Forum Integration for BuddyPress', 'bbpress' ),
@@ -73 +77 @@
             'callback' => 'bbp_admin_setting_callback_akismet_section',
             'page'     => 'discussion'
+        ),
+
+        // Converter
+        'bbp_converter_connection' => array(
+            'title'    => esc_html__( 'Database Settings', 'bbpress' ),
+            'callback' => 'bbp_converter_setting_callback_main_section',
+            'page'     => 'converter'
+        ),
+        'bbp_converter_options' => array(
+            'title'    => esc_html__( 'Options', 'bbpress' ),
+            'callback' => 'bbp_converter_setting_callback_options_section',
+            'page'     => 'converter'
         )
     ) );
@@ -454 +470 @@
                 'title'             => esc_html__( 'Use Akismet', 'bbpress' ),
                 'callback'          => 'bbp_admin_setting_callback_akismet',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            )
+        ),
+
+        /** Converter Page ****************************************************/
+
+        // Connection
+        'bbp_converter_connection' => array(
+
+            // System Select
+            '_bbp_converter_platform' => array(
+                'title'             => esc_html__( 'Select Platform', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_platform',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            ),
+
+            // Database Server
+            '_bbp_converter_db_server' => array(
+                'title'             => esc_html__( 'Database Server', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbserver',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            ),
+
+            // Database Server Port
+            '_bbp_converter_db_port' => array(
+                'title'             => esc_html__( 'Database Port', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbport',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            ),
+
+            // Database Name
+            '_bbp_converter_db_name' => array(
+                'title'             => esc_html__( 'Database Name', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbname',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            ),
+
+            // Database User
+            '_bbp_converter_db_user' => array(
+                'title'             => esc_html__( 'Database User', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbuser',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            ),
+
+            // Database User
+            '_bbp_converter_db_pass' => array(
+                'title'             => esc_html__( 'Database Password', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbpass',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            ),
+
+            // Database User
+            '_bbp_converter_db_prefix' => array(
+                'title'             => esc_html__( 'Table Prefix', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_dbprefix',
+                'sanitize_callback' => 'sanitize_text_field',
+                'args'              => array()
+            )
+        ),
+
+        // Options
+        'bbp_converter_options' => array(
+
+            // Rows Limit
+            '_bbp_converter_rows' => array(
+                'title'             => esc_html__( 'Rows Limit', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_rows',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            ),
+
+            // Delay Time
+            '_bbp_converter_delay_time' => array(
+                'title'             => esc_html__( 'Delay Time', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_delay_time',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            ),
+
+            // Convert Users
+            '_bbp_converter_convert_users' => array(
+                'title'             => esc_html__( 'Convert Users', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_convert_users',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            ),
+
+            // Restart
+            '_bbp_converter_restart' => array(
+                'title'             => esc_html__( 'Start Over', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_restart',
+                'sanitize_callback' => 'intval',
+                'args'              => array()
+            ),
+
+            // Clean
+            '_bbp_converter_clean' => array(
+                'title'             => esc_html__( 'Purge Previous Import', 'bbpress' ),
+                'callback'          => 'bbp_converter_setting_callback_clean',
                 'sanitize_callback' => 'intval',
                 'args'              => array()
@@ -1316 +1438 @@
 ?>
 
-    <input name="_bbp_enable_group_forums" id="_bbp_enable_group_forums" type="checkbox" value="1" <?php checked( bbp_is_group_forums_active( true ) );  bbp_maybe_admin_setting_disabled( '_bbp_enable_group_forums' ); ?> />
+    <input name="_bbp_enable_group_forums" id="_bbp_enable_group_forums" type="checkbox" value="1" <?php checked( bbp_is_group_forums_active( true ) ); bbp_maybe_admin_setting_disabled( '_bbp_enable_group_forums' ); ?> />
     <label for="_bbp_enable_group_forums"><?php esc_html_e( 'Allow BuddyPress Groups to have their own forums', 'bbpress' ); ?></label>
 
@@ -1402 +1524 @@
 ?>
 
-    <input name="_bbp_enable_akismet" id="_bbp_enable_akismet" type="checkbox" value="1" <?php checked( bbp_is_akismet_active( true ) );  bbp_maybe_admin_setting_disabled( '_bbp_enable_akismet' ); ?> />
+    <input name="_bbp_enable_akismet" id="_bbp_enable_akismet" type="checkbox" value="1" <?php checked( bbp_is_akismet_active( true ) ); bbp_maybe_admin_setting_disabled( '_bbp_enable_akismet' ); ?> />
     <label for="_bbp_enable_akismet"><?php esc_html_e( 'Allow Akismet to actively prevent forum spam.', 'bbpress' ); ?></label>
 
@@ -1464 +1586 @@
 
     // Converters
+    $current    = get_option( '_bbp_converter_platform' );
     $converters = bbp_get_converters();
     $options    = '';
@@ -1469 +1592 @@
     // Put options together
     foreach ( $converters as $name => $file ) {
-        $options .= '<option value="' . esc_attr( $name ) . '">' . esc_html( $name ) . '</option>';
+        $options .= '<option value="' . esc_attr( $name ) . '"' . selected( $name, $current, false ) . '>' . esc_html( $name ) . '</option>';
     } ?>
 
@@ -1486 +1609 @@
 ?>
 
-    <input name="_bbp_converter_db_server" id="_bbp_converter_db_server" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_server', 'localhost' ); ?>" class="medium-text" />
+    <input name="_bbp_converter_db_server" id="_bbp_converter_db_server" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_server', 'localhost' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_server' ); ?> />
     <label for="_bbp_converter_db_server"><?php esc_html_e( 'Use default "localhost" if on the same server, otherwise IP or hostname', 'bbpress' ); ?></label>
 
@@ -1500 +1623 @@
 ?>
 
-    <input name="_bbp_converter_db_port" id="_bbp_converter_db_port" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_port', '3306' ); ?>" class="small-text" />
+    <input name="_bbp_converter_db_port" id="_bbp_converter_db_port" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_port', '3306' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_port' ); ?> />
     <label for="_bbp_converter_db_port"><?php esc_html_e( 'Use default "3306" if unsure', 'bbpress' ); ?></label>
 
@@ -1514 +1637 @@
 ?>
 
-    <input name="_bbp_converter_db_user" id="_bbp_converter_db_user" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_user' ); ?>" class="medium-text" />
+    <input name="_bbp_converter_db_user" id="_bbp_converter_db_user" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_user' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_user' ); ?> />
     <label for="_bbp_converter_db_user"><?php esc_html_e( 'User to acces the database', 'bbpress' ); ?></label>
 
@@ -1528 +1651 @@
 ?>
 
-    <input name="_bbp_converter_db_pass" id="_bbp_converter_db_pass" type="password" class="code" value="<?php bbp_form_option( '_bbp_converter_db_pass' ); ?>" class="medium-text" autocomplete="off" />
+    <input name="_bbp_converter_db_pass" id="_bbp_converter_db_pass" type="password" class="code" value="<?php bbp_form_option( '_bbp_converter_db_pass' ); ?>" autocomplete="off" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_pass' ); ?> />
     <label for="_bbp_converter_db_pass"><?php esc_html_e( 'Password of the above database user', 'bbpress' ); ?></label>
 
@@ -1542 +1665 @@
 ?>
 
-    <input name="_bbp_converter_db_name" id="_bbp_converter_db_name" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_name' ); ?>" class="medium-text" />
+    <input name="_bbp_converter_db_name" id="_bbp_converter_db_name" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_name' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_name' ); ?> />
     <label for="_bbp_converter_db_name"><?php esc_html_e( 'Name of the database with your old forum data', 'bbpress' ); ?></label>
 
@@ -1569 +1692 @@
 ?>
 
-    <input name="_bbp_converter_db_prefix" id="_bbp_converter_db_prefix" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_prefix' ); ?>" class="medium-text" />
+    <input name="_bbp_converter_db_prefix" id="_bbp_converter_db_prefix" type="text" class="code" value="<?php bbp_form_option( '_bbp_converter_db_prefix' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_db_prefix' ); ?> />
     <label for="_bbp_converter_db_prefix"><?php esc_html_e( '(If converting from BuddyPress Forums, use "wp_bb_" or your custom prefix)', 'bbpress' ); ?></label>
 
@@ -1583 +1706 @@
 ?>
 
-    <input name="_bbp_converter_rows" id="_bbp_converter_rows" type="number" min="1" max="5000" value="<?php bbp_form_option( '_bbp_converter_rows', '100' ); ?>" class="small-text" />
+    <input name="_bbp_converter_rows" id="_bbp_converter_rows" type="number" min="1" max="5000" value="<?php bbp_form_option( '_bbp_converter_rows', '100' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_rows' ); ?> />
     <label for="_bbp_converter_rows"><?php esc_html_e( 'rows to process at a time', 'bbpress' ); ?></label>
     <p class="description"><?php esc_html_e( 'Keep this low if you experience out-of-memory issues.', 'bbpress' ); ?></p>
@@ -1598 +1721 @@
 ?>
 
-    <input name="_bbp_converter_delay_time" id="_bbp_converter_delay_time" type="number" min="1" max="3600" value="<?php bbp_form_option( '_bbp_converter_delay_time', '1' ); ?>" class="small-text" />
+    <input name="_bbp_converter_delay_time" id="_bbp_converter_delay_time" type="number" min="2" max="3600" value="<?php bbp_form_option( '_bbp_converter_delay_time', '2' ); ?>" <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_delay_time' ); ?> />
     <label for="_bbp_converter_delay_time"><?php esc_html_e( 'second(s) delay between each group of rows', 'bbpress' ); ?></label>
     <p class="description"><?php esc_html_e( 'Keep this high to prevent too-many-connection issues.', 'bbpress' ); ?></p>
@@ -1643 +1766 @@
 ?>
 
-    <input name="_bbp_converter_convert_users" id="_bbp_converter_convert_users" type="checkbox" value="1" <?php checked( get_option( '_bbp_converter_convert_users', false ) ); ?> />
+    <input name="_bbp_converter_convert_users" id="_bbp_converter_convert_users" type="checkbox" value="1" <?php checked( get_option( '_bbp_converter_convert_users', false ) ); ?> <?php bbp_maybe_admin_setting_disabled( '_bbp_converter_convert_users' ); ?> />
     <label for="_bbp_converter_convert_users"><?php esc_html_e( 'Attempt to import user accounts from previous forums', 'bbpress' ); ?></label>
     <p class="description"><?php esc_html_e( 'Non-bbPress passwords cannot be automatically converted. They will be converted as each user logs in.', 'bbpress' ); ?></p>
@@ -1655 +1778 @@
  * The main settings page
  *
+ * @since 2.1.0 bbPress (r3186)
+ *
  * @uses settings_fields() To output the hidden fields for the form
  * @uses do_settings_sections() To output the settings sections
@@ -1661 +1786 @@
 
     // Status
-    $step = (int)  get_option( '_bbp_converter_step',  0     );
-    $max  = 17; // Filter?
+    $step = (int) get_option( '_bbp_converter_step', 0 );
+    $max  = (int) bbpress()->admin->converter->max_steps;
 
     // Starting or continuing?
@@ -1679 +1804 @@
         <h2 class="nav-tab-wrapper"><?php bbp_tools_admin_tabs( esc_html__( 'Import Forums', 'bbpress' ) ); ?></h2>
 
-        <form action="#" method="post" id="bbp-converter-settings">
-
-            <?php settings_fields( 'bbpress_converter' ); ?>
-
-            <?php do_settings_sections( 'bbpress_converter' ); ?>
+        <form action="#" method="post" id="bbp-converter-settings"><?php
+
+            // Fields
+            settings_fields( 'converter' );
+
+            // Sections
+            do_settings_sections( 'converter' );
+
+            ?>
 
             <p class="submit">
@@ -1700 +1829 @@
                                 <span class="toggle-indicator" aria-hidden="true"></span>
                             </button>
-                            <h2 class="hndle ui-sortable-handle"><span><?php esc_html_e( 'Import Monitor', 'bbpress' ); ?></span></h2>
+                            <h2 class="hndle ui-sortable-handle">
+                                <span><?php esc_html_e( 'Import Monitor', 'bbpress' ); ?></span>
+                            </h2>
                             <div class="inside">
+                                <div id="bbp-converter-timer"><?php esc_html_e( 'Timer: Stopped', 'bbpress' ); ?></div>
                                 <div id="bbp-converter-message" class="bbp-converter-log">
                                     <p><?php echo esc_html( $status_text ); ?></p>

trunk/src/includes/core/options.php

@@ -111 +111 @@
         /** Akismet ***********************************************************/
 
-        '_bbp_enable_akismet'       => 1            // Users from all sites can post
-
+        '_bbp_enable_akismet'       => 1,           // Users from all sites can post
+        
+        /** Converter *********************************************************/
+
+        // Connection
+        '_bbp_converter_db_user'    => '',          // Database User
+        '_bbp_converter_db_pass'    => '',          // Database Password
+        '_bbp_converter_db_name'    => '',          // Database Name
+        '_bbp_converter_db_port'    => 3306,        // Database Port
+        '_bbp_converter_db_server'  => 'localhost', // Database Server/IP
+        '_bbp_converter_db_prefix'  => '',          // Database table prefix
+
+        // Options
+        '_bbp_converter_rows'       => 100,         // Number of rows to query
+        '_bbp_converter_delay_time' => 2,           // Seconds to wait between queries
+        '_bbp_converter_step'       => 1,           // Current converter step
+        '_bbp_converter_start'      => 1,           // Step to start at
+        '_bbp_converter_platform'   => '',          // Which platform to use
+        '_bbp_converter_query'      => ''           // Last query
     ) );
 }