Changeset 6785 for trunk/src/includes/admin/tools/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/tools/converter.php (modified) (2 diffs)

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

@@ -21 +21 @@
  */
 function bbp_get_converters() {
+    static $files = array();
 
-    // Default
-    $files  = array();
-    $path   = bbp_setup_converter()->converters_dir;
-    $curdir = opendir( $path );
+    // Only hit the file system one time per page load
+    if ( empty( $files ) ) {
 
-    // Look for the converter file in the converters directory
-    if ( false !== $curdir ) {
-        while ( $file = readdir( $curdir ) ) {
-            if ( stristr( $file, '.php' ) && stristr( $file, 'index' ) === false ) {
-                $name = preg_replace( '/.php/', '', $file );
-                if ( 'Example' !== $name ) {
-                    $files[ $name ] = $path . $file;
+        // Open the converter directory
+        $path   = bbp_setup_converter()->converters_dir;
+        $curdir = opendir( $path );
+
+        // Look for the converter file in the converters directory
+        if ( false !== $curdir ) {
+            while ( $file = readdir( $curdir ) ) {
+                if ( stristr( $file, '.php' ) && stristr( $file, 'index' ) === false ) {
+                    $name = preg_replace( '/.php/', '', $file );
+                    if ( 'Example' !== $name ) {
+                        $files[ $name ] = $path . $file;
+                    }
                 }
             }
         }
-    }
 
-    // Close the directory
-    closedir( $curdir );
+        // Close the directory
+        closedir( $curdir );
 
-    // Sort keys alphabetically, ignoring upper/lower casing
-    if ( ! empty( $files ) ) {
-        natcasesort( $files );
+        // Sort keys alphabetically, ignoring upper/lower casing
+        if ( ! empty( $files ) ) {
+            natcasesort( $files );
+        }
     }
 
@@ -60 +64 @@
  * @param string $platform Name of valid platform class.
  */
-function bbp_new_converter( $platform ) {
+function bbp_new_converter( $platform = '' ) {
 
-    // Default value
-    $converters = bbp_get_converters();
+    // Bail if no platform
+    if ( ! empty( $platform ) ) {
 
-    // Create a new converter object if it's found
-    if ( isset( $converters[ $platform ] ) ) {
+        // Get the available converters
+        $converters = bbp_get_converters();
 
-        // Include & create the converter
-        require_once $converters[ $platform ];
-        if ( class_exists( $platform ) ) {
-            return new $platform;
+        // Create a new converter object if it's found
+        if ( isset( $converters[ $platform ] ) ) {
+
+            // Include & create the converter
+            require_once $converters[ $platform ];
+            if ( class_exists( $platform ) ) {
+                return new $platform;
+            }
         }
     }