Version 4.2.0

applications/core/interface/ipsconnect/ipsconnect.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		IPS Connect remote connections API
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @since		30 May 2013
- * @version		SVN_VERSION_NUMBER
  * @note		Backwards compatibility is not possible due to the way password storage has changed
  */
 
@@ -322,13 +321,7 @@ class ipsConnect
 		if( !\IPS\Request::i()->slaveReturn AND $member->member_id )
 		{
 			\IPS\Session::i()->setMember( $member );
-
-			$member->checkLoginKey();
-
-			$expire = new \IPS\DateTime;
-			$expire->add( new \DateInterval( 'P1Y' ) );
-			\IPS\Request::i()->setCookie( 'member_id', $member->member_id, $expire );
-			\IPS\Request::i()->setCookie( 'pass_hash', $member->member_login_key, $expire );
+			\IPS\Member\Device::loadOrCreate( $member, FALSE )->updateAfterAuthentication( TRUE, 'Ipsconnect' );
 		}
 
 		/* If this was a slave call, we just need to return to the master now */
@@ -409,8 +402,7 @@ class ipsConnect
 		if( \IPS\Request::i()->slaveCall AND $member->member_id )
 		{
 			\IPS\Session\Front::i();
-			\IPS\Request::i()->setCookie( 'member_id', NULL );
-			\IPS\Request::i()->setCookie( 'pass_hash', NULL );
+			\IPS\Request::i()->clearLoginCookies();
 			session_destroy();
 		}
 
@@ -463,8 +455,7 @@ class ipsConnect
 
 			/* Log out of master */
 			\IPS\Session\Front::i();
-			\IPS\Request::i()->setCookie( 'member_id', NULL );
-			\IPS\Request::i()->setCookie( 'pass_hash', NULL );
+			\IPS\Request::i()->clearLoginCookies();
 			session_destroy();
 
 			/* We have hit all the slave installs now, time to go home */
@@ -722,6 +713,7 @@ class ipsConnect
 				}
 				catch( \BadMethodCallException $e ) {}
 			}
+			$member->invalidateSessionsAndLogins();
 
 			$this->_log( "CHANGED_EMAIL", array( 'member' => $member, 'oldEmail' => $oldEmail ), TRUE );
 
@@ -753,7 +745,7 @@ class ipsConnect
 		{
 			$member->members_pass_salt	= \IPS\Request::i()->pass_salt;
 			$member->members_pass_hash	= \IPS\Request::i()->pass_hash;
-			$member->member_login_key	= '';
+			$member->invalidateSessionsAndLogins();
 			$member->save();
 
 			$this->_log( "CHANGED_PASSWORD", $member, TRUE );