Version 4.3.0

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

@@ -27,7 +27,7 @@ class _Vanilla extends \IPS\convert\Software
 	public static function softwareName()
 	{
 		/* Child classes must override this method */
-		return "Vanilla 2";
+		return "Vanilla 2 (2.2.x/2.3.x)";
 	}
 
 	/**
@@ -118,8 +118,8 @@ class _Vanilla extends \IPS\convert\Software
 	 * Resolve the filesystem location of a file from a path stored in the database
 	 * There are several different ways Vanilla may store these, including as remote URL's
 	 *
-	 * @param   $location       File location retrieved from the database
-	 * @param   $uploadsPath    Configured uploads path
+	 * @param   string	$location       File location retrieved from the database
+	 * @param   string	$uploadsPath    Configured uploads path
 	 * @return  \IPS\Http\Url|string|void
 	 */
 	public static function parseMediaLocation( $location, $uploadsPath )
@@ -325,7 +325,7 @@ class _Vanilla 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" );
 	}
@@ -566,4 +566,31 @@ class _Vanilla extends \IPS\convert\Software
 			$libraryClass->setLastKeyValue( $row['MessageID'] );
 		}
 	}
+
+	/**
+	 * Process a login
+	 *
+	 * @param	\IPS\Member		$member			The member
+	 * @param	string			$password		Password from form
+	 * @return	bool
+	 */
+	public function login( $member, $password )
+	{
+		/* Vanilla 2.2 */
+		if( preg_match( '/^\$2[ay]\$(0[4-9]|[1-2][0-9]|3[0-1])\$[a-zA-Z0-9.\/]{53}/', $member->conv_password ) OR mb_substr( $member->conv_password, 0, 3 ) == '$P$' )
+		{
+			require_once \IPS\ROOT_PATH . "/applications/convert/sources/Login/PasswordHash.php";
+			$ph = new \PasswordHash( 8, TRUE );
+			return $ph->CheckPassword( $password, $member->conv_password ) ? TRUE : FALSE;
+		}
+
+		if ( \IPS\Login::compareHashes( $member->conv_password, md5( md5( str_replace( ''', "'", html_entity_decode( $password ) ) ) . $member->misc ) ) )
+		{
+			return TRUE;
+		}
+		else
+		{
+			return FALSE;
+		}
+	}
 }