Changeset 4055

Timestamp:

07/04/2012 03:28:57 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Converter:

• Update verbiage of clean and restart checkboxes.
• Audit usage of sync_table(), and make sure table is created correctly.
• When deleting posts, check correct array items.

Location:

branches/plugin/bbp-admin

Files:

• bbp-converter.php (modified) (4 diffs)
• bbp-settings.php (modified) (2 diffs)

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

@@ -126 +126 @@
         register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_convert_users',     'intval' );
 
+        // Restart
+        add_settings_field( '_bbp_converter_restart',       __( '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',         __( 'Clean',             'bbpress' ), 'bbp_converter_setting_callback_clean', 'bbpress_converter', 'bbpress_converter_opt' );
+        add_settings_field( '_bbp_converter_clean',         __( 'Purge Previous Import', 'bbpress' ), 'bbp_converter_setting_callback_clean', 'bbpress_converter', 'bbpress_converter_opt' );
         register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_clean',             'intval' );
-
-        // Restart
-        add_settings_field( '_bbp_converter_restart',       __( 'Restart',           'bbpress' ), 'bbp_converter_setting_callback_restart', 'bbpress_converter', 'bbpress_converter_opt' );
-        register_setting  ( 'bbpress_converter_opt',        '_bbp_converter_restart',           'intval' );
     }
 
@@ -337 +337 @@
                         update_option( '_bbp_converter_step',  $step + 1 );
                         update_option( '_bbp_converter_start', 0         );
-                        $this->sync_table();
+                        $this->sync_table( true );
                         if ( empty( $start ) ) {
                             $this->converter_output( __( 'No data to clean', 'bbpress' ) );
@@ -510 +510 @@
 
         $table_name = $wpdb->prefix . 'bbp_converter_translator';
-        if ( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+        if ( ! empty( $drop ) && $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name )
             $wpdb->query( "DROP TABLE {$table_name}" );
-        }
-
-        if ( empty( $drop ) ) {
-            require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
-
-            if ( !empty( $wpdb->charset ) ) {
-                $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-            }
-
-            if ( !empty( $wpdb->collate ) ) {
-                $charset_collate .= " COLLATE $wpdb->collate";
-            }
-
-            /** Translator ****************************************************/
-
-            $sql = "CREATE TABLE {$table_name} (
-                        meta_id mediumint(8) unsigned not null auto_increment,
-                        value_type varchar(25) null,
-                        value_id bigint(20) unsigned not null default '0',
-                        meta_key varchar(25) null,
-                        meta_value varchar(25) null,
-                    PRIMARY KEY  (meta_id),
-                        KEY value_id (value_id),
-                        KEY meta_join (meta_key, meta_value) ) {$charset_collate};";
-
-            dbDelta( $sql );
-        }
+
+        require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
+
+        if ( !empty( $wpdb->charset ) ) {
+            $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+        }
+
+        if ( !empty( $wpdb->collate ) ) {
+            $charset_collate .= " COLLATE $wpdb->collate";
+        }
+
+        /** Translator ****************************************************/
+
+        $sql = "CREATE TABLE {$table_name} (
+                    meta_id mediumint(8) unsigned not null auto_increment,
+                    value_type varchar(25) null,
+                    value_id bigint(20) unsigned not null default '0',
+                    meta_key varchar(25) null,
+                    meta_value varchar(25) null,
+                PRIMARY KEY  (meta_id),
+                    KEY value_id (value_id),
+                    KEY meta_join (meta_key, meta_value) ) {$charset_collate};";
+
+        dbDelta( $sql );
     }
 }
@@ -1040 +1037 @@
         $posts = $this->wpdb->get_results( $query, ARRAY_A );
 
-        if ( !empty( $posts ) ) {
+        if ( isset( $posts[0] ) && ! empty( $posts[0]['value_id'] ) ) {
             foreach ( (array) $posts as $value ) {
                 wp_delete_post( $value['value_id'], true );

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

@@ -1123 +1123 @@
 
 /**
+ * Edit Restart setting field
+ *
+ * @since bbPress (r3813)
+ */
+function bbp_converter_setting_callback_restart() {
+?>
+
+    <input id="_bbp_converter_restart" name="_bbp_converter_restart" type="checkbox" id="_bbp_converter_restart" value="1" <?php checked( get_option( '_bbp_converter_restart', false ) ); ?> />
+    <label for="_bbp_converter_restart"><?php _e( 'Start a fresh conversion from the beginning', 'bbpress' ); ?></label>
+    <p class="description"><?php _e( 'You should clean old conversion information before starting over.', 'bbpress' ); ?></p>
+
+<?php
+}
+
+/**
  * Edit Clean setting field
  *
@@ -1132 +1147 @@
     <input id="_bbp_converter_clean" name="_bbp_converter_clean" type="checkbox" id="_bbp_converter_clean" value="1" <?php checked( get_option( '_bbp_converter_clean', false ) ); ?> />
     <label for="_bbp_converter_clean"><?php _e( 'Purge all information from a previously attempted import', 'bbpress' ); ?></label>
-    <p class="description"><?php _e( 'Use this if an import failed and you want to start over from scratch.', 'bbpress' ); ?></p>
-
-<?php
-}
-
-/**
- * Edit Restart setting field
- *
- * @since bbPress (r3813)
- */
-function bbp_converter_setting_callback_restart() {
-?>
-
-    <input id="_bbp_converter_restart" name="_bbp_converter_restart" type="checkbox" id="_bbp_converter_restart" value="1" <?php checked( get_option( '_bbp_converter_restart', false ) ); ?> />
-    <label for="_bbp_converter_restart"><?php _e( 'Restart conversion from the beginning', 'bbpress' ); ?></label>
-    <p class="description"><?php _e( 'The importer keeps track of where it left off in the event of failure.', 'bbpress' ); ?></p>
+    <p class="description"><?php _e( 'Use this if an import failed and you want to remove that incomplete data.', 'bbpress' ); ?></p>
 
 <?php