Version 4.6.0

applications/convert/sources/Software/Core/UBBthreads.php

@@ -116,10 +116,6 @@ class _UBBthreads extends \IPS\convert\Software
 				'table'							=> 'WATCH_LISTS',
 				'where'							=> array( 'WATCH_TYPE=?', 'u' )
 			),
-			'convertRanks'					=> array(
-				'table'							=> 'USER_TITLES',
-				'where'							=> NULL
-			),
 			'convertPrivateMessages'		=> array(
 				'table'							=> 'PRIVATE_MESSAGE_TOPICS',
 				'where'							=> NULL
@@ -302,7 +298,7 @@ class _UBBthreads extends \IPS\convert\Software
 					'field_validation'		=> function( $value ) { if ( !@is_dir( $value ) ) { throw new \DomainException( 'path_invalid' ); } },
 				);
 
-				foreach( array( 'homepage', 'occupation', 'hobbies', 'location', 'icq', 'yahoo', 'aim', 'msn' ) AS $field )
+				foreach( array( 'homepage', 'occupation', 'hobbies', 'location', 'icq', 'yahoo', 'aim', 'msn', 'custom_title' ) AS $field )
 				{
 					\IPS\Member::loggedIn()->language()->words["field_{$field}"]		= \IPS\Member::loggedIn()->language()->addToStack( 'pseudo_field', FALSE, array( 'sprintf' => $field ) );
 					\IPS\Member::loggedIn()->language()->words["field_{$field}_desc"]	= \IPS\Member::loggedIn()->language()->addToStack( 'pseudo_field_desc' );
@@ -572,7 +568,6 @@ class _UBBthreads extends \IPS\convert\Software
 					max( (int) $row['USER_LAST_POST_TIME'], (int) $row['USER_LAST_SEARCH_TIME'] )
 				),
 				'allow_admin_mails'         => ( $row['USER_ACCEPT_ADMIN_EMAILS'] != 'Off' ),
-				'member_title'              => $row['USER_CUSTOM_TITLE'],
 				'member_posts'              => $row['USER_TOTAL_POSTS'],
 				'signature'					=> $row['USER_DEFAULT_SIGNATURE'],
 				'member_last_post'          => \IPS\DateTime::create()->setTimestamp( $row['USER_LAST_POST_TIME'] ),
@@ -585,7 +580,7 @@ class _UBBthreads extends \IPS\convert\Software
 
 			/* Profile fields */
 			$pfields = array();
-			foreach( array( 'homepage', 'occupation', 'hobbies', 'location', 'icq', 'yahoo', 'aim', 'msn' ) AS $pseudo )
+			foreach( array( 'homepage', 'occupation', 'hobbies', 'location', 'icq', 'yahoo', 'aim', 'msn', 'custom_title' ) AS $pseudo )
 			{
 				/* Are we retaining? */
 				if ( $this->app->_session['more_info']['convertMembers']["field_{$pseudo}"] == 'no_convert' )
@@ -667,32 +662,6 @@ class _UBBthreads extends \IPS\convert\Software
 		}
 	}
 
-	/**
-	 * Convert member ranks
-	 *
-	 * @return 	void
-	 */
-	public function convertRanks()
-	{
-		$libraryClass = $this->getLibrary();
-		$libraryClass::setKey( 'USER_TITLE_ID' );
-
-		foreach ( $this->fetch( 'USER_TITLES', 'USER_TITLE_ID' ) as $row )
-		{
-			/**
-			 * @todo: We should probably prompt to keep or overwrite existing titles, since this can currently result...
-			 * ...in duplicate entries for the same post counts if the local rows are not dropped
-			 */
-			$libraryClass->convertRank( array(
-				'id'    => $row['USER_TITLE_ID'],
-				'title' => $row['USER_TITLE_NAME'],
-				'posts' => $row['USER_TITLE_POST_COUNT']
-			) );
-
-			$libraryClass->setLastKeyValue( $row['USER_TITLE_ID'] );
-		}
-	}
-
 	/**
 	 * Convert private messages
 	 *