Version 4.2.0

system/Login/LoginAbstract.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Abstract Login Handler
- * @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		15 Mar 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Login;
@@ -57,6 +56,11 @@ abstract class _LoginAbstract extends \IPS\Node\Model
 	 * @brief	Icon
 	 */
 	public static $icon = 'lock';
+	
+	/** 
+	 * @brief	Logo
+	 */
+	public static $logo = NULL;
 
 	/**
 	 * @brief	Disable the copy button - useful when the forms are very distinctly different
@@ -322,7 +326,7 @@ abstract class _LoginAbstract extends \IPS\Node\Model
 			$member->members_bitoptions['view_sigs'] = TRUE;
 
 			/* Set name - if it already exists, we'll leave it blank and they'll be prompted to fill it in */
-			if ( $name !== NULL and ( !\IPS\Settings::i()->username_characters or preg_match( '/^[' . str_replace( '\-', '-', preg_quote( \IPS\Settings::i()->username_characters, '/' ) ) . ']*$/i', $name ) ) )
+			if ( $name !== NULL and ( !\IPS\Settings::i()->username_characters or preg_match( '/^[' . str_replace( '\-', '-', preg_quote( \IPS\Settings::i()->username_characters, '/' ) ) . ']*$/iu', $name ) ) )
 			{
 				$existingUsername = \IPS\Member::load( $name, 'name' );
 				if ( !$existingUsername->member_id )
@@ -399,9 +403,9 @@ abstract class _LoginAbstract extends \IPS\Node\Model
 			{
 				$member->$k = $v;
 
-				if( $k == 'members_pass_hash' )
+				if( $k == 'members_pass_hash' or $k == 'email' )
 				{
-					$member->member_login_key	= '';
+					$member->invalidateSessionsAndLogins( \IPS\Session::i()->id );
 				}
 			}
 			$member->save();