Version 4.1.2
This commit is contained in:
1 parent
3ba79295ee
commit
28bd025b35
1131 files changed
+63658
-20579
No files matched your search
@@ -454,6 +454,7 @@ class ipsConnect
|
||||
|
||||
/* Does this user already exist? */
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->email, 'email' );
|
||||
|
||||
if ( !$member->member_id )
|
||||
{
|
||||
$member = new \IPS\Member;
|
||||
@@ -491,15 +492,19 @@ class ipsConnect
|
||||
$this->_genericKeyCheck( \IPS\Request::i()->id );
|
||||
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->id, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$member->ipsconnect_revalidate_url = '';
|
||||
$member->save();
|
||||
|
||||
$member->validate();
|
||||
if( $member->member_id )
|
||||
{
|
||||
$member->ipsconnect_revalidate_url = '';
|
||||
$member->save();
|
||||
|
||||
$this->_log( "VALIDATED_ACCOUNT", $member );
|
||||
$member->validate();
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'validate', 'key' => '_SERVER_ID_', 'id' => $member->member_id ) );
|
||||
$this->_log( "VALIDATED_ACCOUNT", $member );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'validate', 'key' => '_SERVER_ID_', 'id' => $member->member_id ) );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -514,12 +519,16 @@ class ipsConnect
|
||||
$this->_genericKeyCheck( \IPS\Request::i()->id );
|
||||
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->id, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$member->delete();
|
||||
|
||||
$this->_log( "DELETED_ACCOUNT", $member );
|
||||
if( $member->member_id )
|
||||
{
|
||||
$member->delete();
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'delete', 'key' => '_SERVER_ID_', 'id' => $member->member_id ) );
|
||||
$this->_log( "DELETED_ACCOUNT", $member );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'delete', 'key' => '_SERVER_ID_', 'id' => $member->member_id ) );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -534,13 +543,17 @@ class ipsConnect
|
||||
$this->_genericKeyCheck( \IPS\Request::i()->id );
|
||||
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->id, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$member->temp_ban = ( \IPS\Request::i()->status == 1 ) ? -1 : 0;
|
||||
$member->save();
|
||||
|
||||
$this->_log( "BANNED_ACCOUNT", $member );
|
||||
if( $member->member_id )
|
||||
{
|
||||
$member->temp_ban = ( \IPS\Request::i()->status == 1 ) ? -1 : 0;
|
||||
$member->save();
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'ban', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'status' => \IPS\Request::i()->status ) );
|
||||
$this->_log( "BANNED_ACCOUNT", $member );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'ban', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'status' => \IPS\Request::i()->status ) );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -557,15 +570,19 @@ class ipsConnect
|
||||
/* Merge the accounts */
|
||||
$memberToKeep = \IPS\Member::load( \IPS\Request::i()->id, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$memberToRemove = \IPS\Member::load( \IPS\Request::i()->remove, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$memberToKeep->merge( $memberToRemove );
|
||||
|
||||
$this->_log( "MERGED_ACCOUNT", array( 'member' => $memberToKeep, 'removed' => $memberToRemove ) );
|
||||
if( $memberToKeep->member_id AND $memberToRemove->member_id )
|
||||
{
|
||||
$memberToKeep->merge( $memberToRemove );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'merge', 'key' => '_SERVER_ID_', 'id' => $memberToKeep->member_id, 'remove' => $memberToRemove->member_id ) );
|
||||
$this->_log( "MERGED_ACCOUNT", array( 'member' => $memberToKeep, 'removed' => $memberToRemove ) );
|
||||
|
||||
/* Remove the second account */
|
||||
$memberToRemove->delete();
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'merge', 'key' => '_SERVER_ID_', 'id' => $memberToKeep->member_id, 'remove' => $memberToRemove->member_id ) );
|
||||
|
||||
/* Remove the second account */
|
||||
$memberToRemove->delete();
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -622,22 +639,25 @@ class ipsConnect
|
||||
$this->_output( "EMAIL_IN_USE" );
|
||||
}
|
||||
|
||||
$oldEmail = $member->email;
|
||||
|
||||
foreach ( \IPS\Login::handlers( TRUE ) as $handler )
|
||||
if( $member->member_id )
|
||||
{
|
||||
try
|
||||
$oldEmail = $member->email;
|
||||
|
||||
foreach ( \IPS\Login::handlers( TRUE ) as $handler )
|
||||
{
|
||||
$handler->changeEmail( $member, $member->email, \IPS\Request::i()->email );
|
||||
try
|
||||
{
|
||||
$handler->changeEmail( $member, $member->email, \IPS\Request::i()->email );
|
||||
}
|
||||
catch( \BadMethodCallException $e ) {}
|
||||
}
|
||||
catch( \BadMethodCallException $e ) {}
|
||||
|
||||
$this->_log( "CHANGED_EMAIL", array( 'member' => $member, 'oldEmail' => $oldEmail ) );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changeEmail', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'email' => \IPS\Request::i()->email ) );
|
||||
}
|
||||
|
||||
$this->_log( "CHANGED_EMAIL", array( 'member' => $member, 'oldEmail' => $oldEmail ) );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changeEmail', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'email' => \IPS\Request::i()->email ) );
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -657,14 +677,18 @@ class ipsConnect
|
||||
}
|
||||
|
||||
$member = \IPS\Member::load( \IPS\Request::i()->id, \IPS\Request::i()->slaveCall ? 'ipsconnect_id' : NULL );
|
||||
$member->members_pass_salt = \IPS\Request::i()->pass_salt;
|
||||
$member->members_pass_hash = \IPS\Request::i()->pass_hash;
|
||||
$member->save();
|
||||
|
||||
$this->_log( "CHANGED_PASSWORD", $member );
|
||||
if( $member->member_id )
|
||||
{
|
||||
$member->members_pass_salt = \IPS\Request::i()->pass_salt;
|
||||
$member->members_pass_hash = \IPS\Request::i()->pass_hash;
|
||||
$member->save();
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changePassword', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'pass_hash' => \IPS\Request::i()->pass_hash, 'pass_salt' => \IPS\Request::i()->pass_salt ) );
|
||||
$this->_log( "CHANGED_PASSWORD", $member );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changePassword', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'pass_hash' => \IPS\Request::i()->pass_hash, 'pass_salt' => \IPS\Request::i()->pass_salt ) );
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -698,22 +722,25 @@ class ipsConnect
|
||||
$this->_output( "USERNAME_IN_USE" );
|
||||
}
|
||||
|
||||
$oldName = $member->name;
|
||||
|
||||
foreach ( \IPS\Login::handlers( TRUE ) as $handler )
|
||||
if( $member->member_id )
|
||||
{
|
||||
try
|
||||
$oldName = $member->name;
|
||||
|
||||
foreach ( \IPS\Login::handlers( TRUE ) as $handler )
|
||||
{
|
||||
$handler->changeUsername( $member, $member->name, \IPS\Request::i()->name );
|
||||
try
|
||||
{
|
||||
$handler->changeUsername( $member, $member->name, \IPS\Request::i()->name );
|
||||
}
|
||||
catch( \BadMethodCallException $e ) {}
|
||||
}
|
||||
catch( \BadMethodCallException $e ) {}
|
||||
|
||||
$this->_log( "CHANGED_NAME", array( 'member' => $member, 'oldName' => $oldName ) );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changeName', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'name' => \IPS\Request::i()->name ) );
|
||||
}
|
||||
|
||||
$this->_log( "CHANGED_NAME", array( 'member' => $member, 'oldName' => $oldName ) );
|
||||
|
||||
/* Do we have any slaves to call? */
|
||||
$this->_propagateRequest( array( 'do' => 'changeName', 'key' => '_SERVER_ID_', 'id' => $member->member_id, 'name' => \IPS\Request::i()->name ) );
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user