Version 4.6.0
This commit is contained in:
1 parent
f79dcf067a
commit
517a5e1f70
2036 files changed
+110041
-26162
No files matched your search
@@ -123,10 +123,6 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
'table' => 'privatemessage',
|
||||
'where' => array( "msgtype=?", 'message' ),
|
||||
),
|
||||
'convertRanks' => array(
|
||||
'table' => 'usertitle',
|
||||
'where' => NULL
|
||||
),
|
||||
'convertClubs' => array(
|
||||
'table' => 'node',
|
||||
'where' => 'clubs'
|
||||
@@ -453,7 +449,7 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
);
|
||||
|
||||
/* And decide what to do about these... */
|
||||
foreach( array( 'homepage', 'icq', 'aim', 'yahoo', 'msn', 'skype', 'google' ) AS $field )
|
||||
foreach( array( 'homepage', 'icq', 'aim', 'yahoo', 'msn', 'skype', 'google', 'user_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' );
|
||||
@@ -1095,7 +1091,6 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
'mgroup_others' => $user['membergroupids'],
|
||||
'name' => html_entity_decode( $user['username'], \ENT_QUOTES | \ENT_HTML5, 'UTF-8' ),
|
||||
'email' => $user['email'],
|
||||
'member_title' => \in_array( $user['usertitle'], $userTitles ) ? NULL : $user['usertitle'],
|
||||
'joined' => $user['joindate'],
|
||||
'ip_address' => $user['ipaddress'],
|
||||
'warn_level' => $user['ipoints'],
|
||||
@@ -1160,7 +1155,7 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
}
|
||||
|
||||
/* Pseudo Fields */
|
||||
foreach( array( 'homepage', 'icq', 'aim', 'yahoo', 'msn', 'skype', 'google' ) AS $pseudo )
|
||||
foreach( array( 'homepage', 'icq', 'aim', 'yahoo', 'msn', 'skype', 'google', 'user_title' ) AS $pseudo )
|
||||
{
|
||||
/* Are we retaining? */
|
||||
if ( $this->app->_session['more_info']['convertMembers']["field_{$pseudo}"] == 'no_convert' )
|
||||
@@ -1188,8 +1183,15 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
'pf_show_on_reg' => 0,
|
||||
) );
|
||||
}
|
||||
|
||||
$profileFields[$pseudo] = $user[$pseudo];
|
||||
|
||||
if( $pseudo == 'user_title' )
|
||||
{
|
||||
$profileFields[ $pseudo ] = \in_array( $user['usertitle'], $userTitles ) ? NULL : $user['usertitle'];
|
||||
}
|
||||
else
|
||||
{
|
||||
$profileFields[ $pseudo ] = $user[ $pseudo ];
|
||||
}
|
||||
}
|
||||
|
||||
/* Profile Photos */
|
||||
@@ -1549,29 +1551,6 @@ class _Vbulletin5 extends \IPS\convert\Software
|
||||
$libraryClass->setLastKeyValue( $pm['nodeid'] );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert ranks
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function convertRanks()
|
||||
{
|
||||
$libraryClass = $this->getLibrary();
|
||||
|
||||
$libraryClass::setKey( 'usertitleid' );
|
||||
|
||||
foreach( $this->fetch( 'usertitle', 'usertitleid' ) AS $rank )
|
||||
{
|
||||
$libraryClass->convertRank( array(
|
||||
'id' => $rank['usertitleid'],
|
||||
'posts' => $rank['minposts'],
|
||||
'title' => $rank['title']
|
||||
) );
|
||||
|
||||
$libraryClass->setLastKeyValue( $rank['usertitleid'] );
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert clubs
|
||||
|
||||
Reference in new issue
Block a user