Changeset 5153

Timestamp:

11/12/2013 08:08:30 AM (11 years ago)

Author:

netweb

Message:

vBulletin v4.x Importer Improvements. Props netweb. Fixes #2469

• Added Forum total topic count
• Added Forum total reply count
• Added Forum/Category type field mapping & callback
• Added Topic total reply count
• Added Topic author ip
• Added Store old user salt in usermeta
• Added Reply slug
• Improved inline docs

File:

• trunk/includes/admin/converters/vBulletin.php (modified) (12 diffs)

trunk/includes/admin/converters/vBulletin.php

@@ -58 +58 @@
         );
 
+        // Forum total topic count (Includes unpublished topics, Stored in postmeta)
+        $this->field_map[] = array(
+            'from_tablename'  => 'forum',
+            'from_fieldname'  => 'threadcount',
+            'to_type'         => 'forum',
+            'to_fieldname'    => '_bbp_total_topic_count'
+        );
+
+        // Forum total reply count (Includes unpublished replies, Stored in postmeta)
+        $this->field_map[] = array(
+            'from_tablename'  => 'forum',
+            'from_fieldname'  => 'replycount',
+            'to_type'         => 'forum',
+            'to_fieldname'    => '_bbp_total_reply_count'
+        );
+
         // Forum title.
         $this->field_map[] = array(
@@ -92 +108 @@
         );
 
+        // Forum type (Category = -1 or Forum > 0, Stored in postmeta)
+        $this->field_map[] = array(
+            'from_tablename'  => 'forum',
+            'from_fieldname'  => 'parentid',
+            'to_type'         => 'forum',
+            'to_fieldname'    => '_bbp_forum_type',
+            'callback_method' => 'callback_forum_type'
+        );
+
         // Forum dates.
         $this->field_map[] = array(
@@ -142 +167 @@
         );
 
+        // Topic total reply count (Includes unpublished replies, Stored in postmeta)
+        $this->field_map[] = array(
+            'from_tablename'  => 'thread',
+            'from_fieldname'  => 'replycount',
+            'to_type'         => 'topic',
+            'to_fieldname'    => '_bbp_total_reply_count',
+            'callback_method' => 'callback_topic_reply_count'
+        );
+
         // Topic author.
         $this->field_map[] = array(
@@ -149 +183 @@
             'to_fieldname'    => 'post_author',
             'callback_method' => 'callback_userid'
+        );
+
+        // Topic Author ip (Stored in postmeta)
+        // Note: We join the 'post' table because 'thread' table does not include topic content.
+        $this->field_map[] = array(
+            'from_tablename'  => 'post',
+            'from_fieldname'  => 'ipaddress',
+            'join_tablename'  => 'thread',
+            'join_type'       => 'INNER',
+            'join_expression' => 'USING (threadid) WHERE post.parentid = 0',
+            'to_type'         => 'topic',
+            'to_fieldname'    => '_bbp_author_ip'
         );
 
@@ -178 +224 @@
 
         // Topic content.
-        // Note: We join the posts table because topics do not have content.
+        // Note: We join the 'post' table because 'thread' table does not include topic content.
         $this->field_map[] = array(
             'from_tablename'  => 'post',
@@ -277 +323 @@
 
         // Reply parent forum id (If no parent, then 0. Stored in postmeta)
+        // Note: We join the 'thread' table because 'post' table does not include forum id.
         $this->field_map[] = array(
             'from_tablename'  => 'thread',
@@ -288 +335 @@
         );
 
-        // Reply parent topic id (If no parent, then 0. Stored in postmeta)
+        // Reply parent topic id (If no parent, then 0, Stored in postmeta)
         $this->field_map[] = array(
             'from_tablename'  => 'post',
@@ -315 +362 @@
 
         // Reply title.
-        // Note: We join the thread table because post table does not include topic title.
+        // Note: We join the 'thread' table because 'post' table does not include reply title.
         $this->field_map[] = array(
             'from_tablename'  => 'thread',
@@ -326 +373 @@
             'callback_method' => 'callback_reply_title'
         );
+
+        // Reply slug (Clean name to avoid conflicts)
+        // Note: We join the 'thread' table because 'post' table does not include reply slug.
+        $this->field_map[] = array(
+            'from_tablename'  => 'thread',
+            'from_fieldname'  => 'title',
+            'join_tablename'  => 'post',
+            'join_type'       => 'INNER',
+            'join_expression' => 'USING (threadid) WHERE post.parentid != 0',
+            'to_type'         => 'reply',
+            'to_fieldname'    => 'post_name',
+            'callback_method' => 'callback_slug'
+        );
 
         // Reply content.
@@ -399 +459 @@
             'from_fieldname' => 'salt',
             'to_type'        => 'user',
-            'to_fieldname'   => ''
+            'to_fieldname'   => '_bbp_salt'
         );
 
@@ -498 +558 @@
      */
     public function callback_savepass( $field, $row ) {
-        $pass_array = array( 'hash'  => $field, 'salt'   => $row['salt'] );
+        $pass_array = array( 'hash' => $field, 'salt' => $row['salt'] );
         return $pass_array;
     }
@@ -506 +566 @@
      * to a pass the user has typed in.
      *
-     * vBulletin passwords do not work. Maybe use the below plugin's approach?
-     *
-     * @link http://wordpress.org/extend/plugins/vb-user-copy/
-     * @link http://plugins.trac.wordpress.org/browser/vb-user-copy/trunk/vb_user_copy.php
      */
     public function authenticate_pass( $password, $serialized_pass ) {
         $pass_array = unserialize( $serialized_pass );
         return ( $pass_array['hash'] == md5( md5( $password ) . $pass_array['salt'] ) );
+    }
+
+    /**
+     * Translate the forum type from vBulletin v4.x numeric's to WordPress's strings.
+     *
+     * @param int $status vBulletin v4.x numeric forum type
+     * @return string WordPress safe
+     */
+    public function callback_forum_type( $status = 0 ) {
+        if ( $status == -1 ) {
+            $status = 'category';
+        } else {
+            $status = 'forum';
+        }
+        return $status;
     }