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

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

File:

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

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';
 
         /**