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

Timestamp:

02/19/2018 07:00:55 AM (7 years ago)

Author:

johnjamesjacoby

Message:

Converter: remove WP_SETUP_CONFIG constant setting from converter process.

This introduces a helper database class to avoid directly connecting to the external database. Instead, we'll attempt to control that connection, and provide feedback to the user in the event a connection cannot be made. The WP_SETUP_CONFIG was causing calls to the options API to fail, resulting in broken calculations and invalid offsets.

This commit includes some general load order clean-up, which also fixes a regression causing fatal errors when attempting to upgrade converted user passwords from the old platform. It also fixes the condition where boundaries being converted would display beyond their maximums.

Fixes #3191.

File:

• trunk/src/includes/admin/classes/class-bbp-converter.php (modified) (5 diffs)

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

@@ -216 +216 @@
 
         // Maybe prepend the step
-        $progress = ! empty( $this->step )
-            ? sprintf( '<span class="step">%s.</span><span class="output">%s</span><span class="mini-step">%s</span>', $this->step, $output, $this->step_percentage . '%' )
-            : $output;
+        if ( ! empty( $this->step ) ) {
+
+            // Include percentage
+            if ( ! empty( $this->rows_in_step ) ) {
+                $progress = sprintf( '<span class="step">%s.</span><span class="output">%s</span><span class="mini-step">%s</span>', $this->step, $output, $this->step_percentage . '%' );
+
+            // Don't include percentage
+            } else {
+                $progress = sprintf( '<span class="step">%s.</span><span class="output">%s</span>', $this->step, $output );
+            }
+
+        // Raw text
+        } else {
+            $progress = $output;
+        }
 
         // Output
@@ -428 +440 @@
      */
     private function bump_start() {
+
+        // Set rows in step from option
+        $this->rows_in_step = get_option( '_bbp_converter_rows_in_step', 0 );
+
+        // Get rows to start from
         $start = (int) ( $this->start + $this->rows );
 
+        // Enforce maximum if exists
+        if ( $this->rows_in_step > 0 ) {
+
+            // Start cannot be larger than total rows
+            if ( $start > $this->rows_in_step ) {
+                $start = $this->rows_in_step;
+            }
+
+            // Max can't be greater than total rows
+            if ( $this->max > $this->rows_in_step ) {
+                $this->max = $this->rows_in_step;
+            }
+        }
+
+        // Update the start option
         update_option( '_bbp_converter_start', $start );
     }
@@ -467 +499 @@
             } else {
                 $this->bump_start();
-                $this->converter_response( sprintf( esc_html__( 'Deleting previously converted data (%1$s through %2$s of %3$s)', 'bbpress' ), $this->start, $this->max, $this->rows_in_step) );
+                $this->converter_response( sprintf( esc_html__( 'Deleting previously converted data (%1$s through %2$s)', 'bbpress' ), $this->start, $this->max ) );
             }
 
@@ -493 +525 @@
             } else {
                 $this->bump_start();
-                $this->converter_response( sprintf(  esc_html__( 'Converting users (%1$s through %2$s of %3$s)', 'bbpress' ), $this->start, $this->max, $this->rows_in_step ) );
+                $this->converter_response( sprintf( esc_html__( 'Converting users (%1$s through %2$s of %3$s)', 'bbpress' ), $this->start, $this->max, $this->rows_in_step ) );
             }
         } else {
@@ -516 +548 @@
             } else {
                 $this->bump_start();
-                $this->converter_response( sprintf( esc_html__( 'Delete default WordPress user passwords (%1$s through %2$s of %3$s)', 'bbpress' ), $this->start, $this->max, $this->rows_in_step ) );
+                $this->converter_response( sprintf( esc_html__( 'Delete default WordPress user passwords (%1$s through %2$s)', 'bbpress' ), $this->start, $this->max ) );
             }
         } else {