Version 4.3.0

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

@@ -84,6 +84,30 @@ class _Expressionengine extends \IPS\convert\Software
 		);
 	}
 
+	/**
+	 * Allows software to add additional menu row options
+	 *
+	 * @param	array 	$rows	Existing rows
+	 * @return	array
+	 */
+	public function extraMenuRows( $rows )
+	{
+		if( isset( $rows['convertPrivateMessageReplies'] ) )
+		{
+			$rows['convertPmAttachments'] = array(
+				'step_method'		=> 'convertPmAttachments',
+				'step_title'		=> 'convert_attachments',
+				'ips_rows'			=> \IPS\Db::i()->select( 'COUNT(*)', 'core_attachments' )->first(),
+				'source_rows'		=> $this->countRows( static::canConvert()['convertPmAttachments']['table'], static::canConvert()['convertPmAttachments']['where'] ),
+				'per_cycle'			=> 100,
+				'dependencies'		=> array( 'convertPrivateMessageReplies' ),
+				'link_type'			=> 'core_attachments',
+			);
+		}
+
+		return $rows;
+	}
+
 	/**
 	 * Can we convert passwords from this software.
 	 *
@@ -288,7 +312,7 @@ class _Expressionengine 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" );
 	}
@@ -724,4 +748,39 @@ class _Expressionengine 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 )
+	{
+		$length = \strlen( $member->conv_password );
+		$providedHash = FALSE;
+
+		switch( $length )
+		{
+			/* MD5 */
+			case 32:
+				$providedHash = md5( $password );
+			break;
+			/* SHA1 */
+			case 40:
+				$providedHash = sha1( $password );
+			break;
+			/* SHA256 */
+			case 64:
+				$providedHash = hash( 'sha256', $password );
+			break;
+			/* SHA512 */
+			case 128:
+				$providedHash = hash( 'sha512', $password );
+			break;
+		}
+
+		return ( \IPS\Login::compareHashes( $member->conv_password, $providedHash ) ) ? TRUE : FALSE;
+	}
 }