diff -r c7c0fbc09788 -r 5e8dcbe22c24 web/wp-content/plugins/bbpress/includes/admin/converters/vBulletin.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/wp-content/plugins/bbpress/includes/admin/converters/vBulletin.php	Tue Dec 04 18:43:10 2012 -0800
@@ -0,0 +1,448 @@
+<?php
+
+/**
+ * vBulletin Converter
+ *
+ * @since bbPress (r)
+ */
+class vBulletin extends BBP_Converter_Base {
+
+	/**
+	 * Main constructor
+	 *
+	 * @uses vBulletin::setup_globals()
+	 */
+	function __construct() {
+		parent::__construct();
+		$this->setup_globals();
+	}
+
+	/**
+	 * Sets up the field mappings
+	 */
+	private function setup_globals() {
+
+		/** Forum Section *****************************************************/
+
+		// Forum id (Stored in postmeta)
+		$this->field_map[] = array(
+			'from_tablename' => 'forum',
+			'from_fieldname' => 'forumid',
+			'to_type'        => 'forum',
+			'to_fieldname'   => '_bbp_forum_id'
+		);
+
+		// Forum parent id (If no parent, than 0. Stored in postmeta)
+		$this->field_map[] = array(
+			'from_tablename' => 'forum',
+			'from_fieldname' => 'parentid',
+			'to_type'        => 'forum',
+			'to_fieldname'   => '_bbp_forum_parent_id'
+		);
+
+		// Forum title.
+		$this->field_map[] = array(
+			'from_tablename' => 'forum',
+			'from_fieldname' => 'title',
+			'to_type'        => 'forum',
+			'to_fieldname'   => 'post_title'
+		);
+
+		// Forum slug (Clean name to avoid confilcts)
+		$this->field_map[] = array(
+			'from_tablename'  => 'forum',
+			'from_fieldname'  => 'title_clean',
+			'to_type'         => 'forum',
+			'to_fieldname'    => 'post_name',
+			'callback_method' => 'callback_slug'
+		);
+
+		// Forum description.
+		$this->field_map[] = array(
+			'from_tablename'  => 'forum',
+			'from_fieldname'  => 'description',
+			'to_type'         => 'forum',
+			'to_fieldname'    => 'post_content',
+			'callback_method' => 'callback_null'
+		);
+
+		// Forum display order (Starts from 1)
+		$this->field_map[] = array(
+			'from_tablename' => 'forum',
+			'from_fieldname' => 'displayorder',
+			'to_type'        => 'forum',
+			'to_fieldname'   => 'menu_order'
+		);
+
+		// Forum date update.
+		$this->field_map[] = array(
+			'to_type'      => 'forum',
+			'to_fieldname' => 'post_date',
+			'default'      => date( 'Y-m-d H:i:s' )
+		);
+		$this->field_map[]	 = array(
+			'to_type'      => 'forum',
+			'to_fieldname' => 'post_date_gmt',
+			'default'      => date( 'Y-m-d H:i:s' )
+		);
+		$this->field_map[]	 = array(
+			'to_type'      => 'forum',
+			'to_fieldname' => 'post_modified',
+			'default'      => date( 'Y-m-d H:i:s' )
+		);
+		$this->field_map[]	 = array(
+			'to_type'      => 'forum',
+			'to_fieldname' => 'post_modified_gmt',
+			'default'      => date( 'Y-m-d H:i:s' )
+		);
+
+		/** Topic Section *****************************************************/
+
+		// Topic id (Stored in postmeta)
+		$this->field_map[] = array(
+			'from_tablename' => 'thread',
+			'from_fieldname' => 'threadid',
+			'to_type'        => 'topic',
+			'to_fieldname'   => '_bbp_topic_id'
+		);
+
+		// Forum id (Stored in postmeta)
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'forumid',
+			'to_type'         => 'topic',
+			'to_fieldname'    => '_bbp_forum_id',
+			'callback_method' => 'callback_forumid'
+		);
+
+		// Topic author.
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'postuserid',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_author',
+			'callback_method' => 'callback_userid'
+		);
+
+		// Topic title.
+		$this->field_map[] = array(
+			'from_tablename' => 'thread',
+			'from_fieldname' => 'title',
+			'to_type'        => 'topic',
+			'to_fieldname'   => 'post_title'
+		);
+
+		// Topic slug (Clean name to avoid conflicts)
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'title',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_name',
+			'callback_method' => 'callback_slug'
+		);
+
+		// Forum id (If no parent, than 0)
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'forumid',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_parent',
+			'callback_method' => 'callback_forumid'
+		);
+
+		// Topic content.
+		// Note: We join the posts table because topics do not have content.
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'pagetext',
+			'join_tablename'  => 'thread',
+			'join_type'       => 'INNER',
+			'join_expression' => 'USING (threadid) WHERE post.parentid = 0',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_content',
+			'callback_method' => 'callback_html'
+		);
+
+		// Topic date update.
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_date',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_date_gmt',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_modified',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[] = array(
+			'from_tablename'  => 'thread',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'topic',
+			'to_fieldname'    => 'post_modified_gmt',
+			'callback_method' => 'callback_datetime'
+		);
+
+		/** Tags Section ******************************************************/
+
+		// Topic id.
+		$this->field_map[] = array(
+			'from_tablename'  => 'tagcontent',
+			'from_fieldname'  => 'contentid',
+			'to_type'         => 'tags',
+			'to_fieldname'    => 'objectid',
+			'callback_method' => 'callback_topicid'
+		);
+
+		// Tags text.
+		$this->field_map[] = array(
+			'from_tablename'  => 'tag',
+			'from_fieldname'  => 'tagtext',
+			'join_tablename'  => 'tagcontent',
+			'join_type'       => 'INNER',
+			'join_expression' => 'USING (tagid)',
+			'to_type'         => 'tags',
+			'to_fieldname'    => 'name'
+		);
+
+		/** Post Section ******************************************************/
+
+		// Post id (Stores in postmeta)
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'postid',
+			'from_expression' => 'WHERE post.parentid != 0',
+			'to_type'         => 'reply',
+			'to_fieldname'    => '_bbp_post_id'
+		);
+
+		// Forum id (Stores in postmeta)
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'threadid',
+			'to_type'         => 'reply',
+			'to_fieldname'    => '_bbp_forum_id',
+			'callback_method' => 'callback_topicid_to_forumid'
+		);
+
+		// Topic id (Stores in postmeta)
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'threadid',
+			'to_type'         => 'reply',
+			'to_fieldname'    => '_bbp_topic_id',
+			'callback_method' => 'callback_topicid'
+		);
+
+		// Author ip.
+		$this->field_map[] = array(
+			'from_tablename' => 'post',
+			'from_fieldname' => 'ipaddress',
+			'to_type'        => 'reply',
+			'to_fieldname'   => '_bbp_author_ip'
+		);
+
+		// Post author.
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'userid',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_author',
+			'callback_method' => 'callback_userid'
+		);
+
+		// Topic title.
+		$this->field_map[] = array(
+			'from_tablename' => 'post',
+			'from_fieldname' => 'title',
+			'to_type'        => 'reply',
+			'to_fieldname'   => 'post_title'
+		);
+
+		// Topic slug (Clean name)
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'title',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_name',
+			'callback_method' => 'callback_slug'
+		);
+
+		// Post content.
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'pagetext',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_content',
+			'callback_method' => 'callback_html'
+		);
+
+		// Topic id (If no parent, than 0)
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'threadid',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_parent',
+			'callback_method' => 'callback_topicid'
+		);
+
+		// Topic date update.
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_date',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_date_gmt',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[] = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_modified',
+			'callback_method' => 'callback_datetime'
+		);
+		$this->field_map[]	 = array(
+			'from_tablename'  => 'post',
+			'from_fieldname'  => 'dateline',
+			'to_type'         => 'reply',
+			'to_fieldname'    => 'post_modified_gmt',
+			'callback_method' => 'callback_datetime'
+		);
+
+		/** User Section ******************************************************/
+
+		// Store old User id (Stores in usermeta)
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'userid',
+			'to_type'        => 'user',
+			'to_fieldname'   => '_bbp_user_id'
+		);
+
+		// Store old User password (Stores in usermeta serialized with salt)
+		$this->field_map[] = array(
+			'from_tablename'  => 'user',
+			'from_fieldname'  => 'password',
+			'to_type'         => 'user',
+			'to_fieldname'    => '_bbp_password',
+			'callback_method' => 'callback_savepass'
+		);
+
+		// Store old User Salt (This is only used for the SELECT row info for
+		// the above password save)
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'salt',
+			'to_type'        => 'user',
+			'to_fieldname'   => ''
+		);
+
+		// User password verify class (Stores in usermeta for verifying password)
+		$this->field_map[] = array(
+			'to_type'      => 'user',
+			'to_fieldname' => '_bbp_class',
+			'default'      => 'vBulletin'
+		);
+
+		// User name.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'username',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'user_login'
+		);
+
+		// User nice name.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'user_nicename',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'user_nicename'
+		);
+
+		// User email.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'email',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'user_email'
+		);
+
+		// User homepage.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'homepage',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'user_url'
+		);
+
+		// User registered.
+		$this->field_map[] = array(
+			'from_tablename'  => 'user',
+			'from_fieldname'  => 'joindate',
+			'to_type'         => 'user',
+			'to_fieldname'    => 'user_registered',
+			'callback_method' => 'callback_datetime'
+		);
+
+		// User aim.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'aim',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'aim'
+		);
+
+		// User yahoo.
+		$this->field_map[] = array(
+			'from_tablename' => 'user',
+			'from_fieldname' => 'yahoo',
+			'to_type'        => 'user',
+			'to_fieldname'   => 'yim'
+		);
+	}
+
+	/**
+	 * This method allows us to indicates what is or is not converted for each
+	 * converter.
+	 */
+	public function info() {
+		return '';
+	}
+
+	/**
+	 * This method is to save the salt and password together.  That
+	 * way when we authenticate it we can get it out of the database
+	 * as one value. Array values are auto sanitized by wordpress.
+	 */
+	public function callback_savepass( $field, $row ) {
+		$pass_array = array( 'hash'	 => $field, 'salt'	 => $row['salt'] );
+		return $pass_array;
+	}
+
+	/**
+	 * This method is to take the pass out of the database and compare
+	 * to a pass the user has typed in.
+	 */
+	public function authenticate_pass( $password, $serialized_pass ) {
+		$pass_array = unserialize( $serialized_pass );
+		return ( $pass_array['hash'] == md5( md5( $password ) . $pass_array['salt'] ) );
+	}
+}