Version 4.3.0

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

@@ -28,7 +28,7 @@ class _Smf extends \IPS\convert\Software
 	public static function softwareName()
 	{
 		/* Child classes must override this method */
-		return "Simple Machines Forum";
+		return "Simple Machines Forum (2.0.x)";
 	}
 	
 	/**
@@ -226,7 +226,7 @@ class _Smf extends \IPS\convert\Software
 					'field_class'			=> 'IPS\\Helpers\\Form\\Radio',
 					'field_default'			=> 'user_name',
 					'field_required'		=> TRUE,
-					'field_extra'			=> array( 'options' => array( 'user_name', 'display_name' ) ),
+					'field_extra'			=> array( 'options' => array( 'user_name' => 'user_name', 'display_name' => 'display_name' ) ),
 					'field_hint'			=> NULL,
 				);
 
@@ -298,7 +298,7 @@ class _Smf extends \IPS\convert\Software
 		\IPS\Task::queue( 'convert', 'RebuildConversationFirstIds', array( 'app' => $this->app->app_id ), 2, array( 'app' ) );
 		
 		/* Attachments */
-		\IPS\Task::queue( 'core', 'RebuildAttachmentThumbnails', array( 'app' => $this->app->app_id ), 4, array( 'app' ) );
+		\IPS\Task::queue( 'core', 'RebuildAttachmentThumbnails', array( 'app' => $this->app->app_id ), 1, array( 'app' ) );
 		
 		return array( "f_search_index_rebuild", "f_clear_caches", "f_rebuild_pms", "f_signatures_rebuild", "f_rebuild_attachments" );
 	}
@@ -318,7 +318,7 @@ class _Smf extends \IPS\convert\Software
 		$post = str_replace( $search, $replace, $post );
 
 		// And img tags
-		$post = preg_replace("#\[img width=(\d+)(?: height=(\d+))?\]([a-zA-Z0-9.:\-/%\?&_]+)\[\/img\]#i", "[img]$3[/img]", $post);
+		$post = preg_replace("#\[img width=(\d+)(?: height=(\d+))?\]([a-zA-Z0-9.:\-/%\?&_=~\#\(\);:]+)\[\/img\]#i", "[img]$3[/img]", $post);
 
 		//Quotes
 		$post = preg_replace("#\[quote author=(.+?) link=(.+?)=(\d+)\.msg(\d+)(.+?)date=(\d+)\](.+)\[\/quote\]#i", "[quote name=\"$1\" post=\"$4\" timestamp=\"$6\"]$7[/quote]", $post);
@@ -648,7 +648,7 @@ class _Smf extends \IPS\convert\Software
 				'email'					=> $row['email_address'],
 				'name'					=> $name,
 				'password'				=> $row['passwd'],
-				'password_extra'		=> $row['password_salt'],
+				'password_extra'		=> $row['member_name'], // We need to keep the original member name for the SMF password hash
 				'member_group_id'		=> $row['id_group'],
 				'joined'				=> $row['date_registered'],
 				'ip_address'			=> $row['member_ip'],
@@ -900,4 +900,45 @@ class _Smf extends \IPS\convert\Software
 
 		return NULL;
 	}
+
+	/**
+	 * Process a login
+	 *
+	 * @param	\IPS\Member		$member			The member
+	 * @param	string			$password		Password from form
+	 * @return	bool
+	 */
+	public function login( $member, $password )
+	{
+		if ( \IPS\Login::compareHashes( $member->conv_password, sha1( mb_strtolower( $member->name ) . html_entity_decode( $password ) ) ) )
+		{
+			return TRUE;
+		}
+		else if ( \IPS\Login::compareHashes( $member->conv_password, sha1( mb_strtolower( $member->name ) . $password ) ) )
+		{
+			return TRUE;
+		}
+		/* In 4.2.6 we save the original members name as the salt so that we don't have one that has been modified in the conversion process */
+		else if ( \IPS\Login::compareHashes( $member->conv_password, sha1( mb_strtolower( $member->conv_password_extra ) . $password ) ) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			require_once \IPS\ROOT_PATH . "/applications/convert/sources/Login/PasswordHash.php";
+			$ph = new \PasswordHash( 8, TRUE );
+
+			if( $ph->CheckPassword( mb_strtolower( $member->name ) . $password, $member->conv_password ) )
+			{
+				return TRUE;
+			}
+			/* In 4.2.6 we save the original members name as the salt so that we don't have one that has been modified in the conversion process */
+			else if ( $ph->CheckPassword( mb_strtolower( $member->conv_password_extra ) . $password, $member->conv_password ) )
+			{
+				return TRUE;
+			}
+		}
+
+		return FALSE;
+	}
 }