moving the code that sends email into admin tools

Author: erikyo

admin/CF7_AntiSpam_Admin_Tools.php

@@ -2,11 +2,6 @@
 
 namespace CF7_AntiSpam\Admin;
 
-use CF7_AntiSpam\Core\CF7_AntiSpam;
-use CF7_AntiSpam\Core\CF7_AntiSpam_Filters;
-use CF7_AntiSpam\Core\CF7_AntiSpam_Flamingo;
-use CF7_AntiSpam\Engine\CF7_AntiSpam_Uninstaller;
-
 /**
  * The plugin admin tools
  *
@@ -23,17 +18,20 @@ class CF7_AntiSpam_Admin_Tools {
 	/**
 	 * It sets a transient with the name of `cf7a_notice` and the value of the notice
 	 *
-	 * @param string  $message The message you want to display.
-	 * @param string  $type error, warning, success, info.
+	 * @param string $message The message you want to display.
+	 * @param string $type error, warning, success, info.
 	 * @param boolean $dismissible when the notice needs the close button.
 	 */
-	public static function cf7a_push_notice( $message = 'generic', $type = 'error', $dismissible = true ) {
+	public static function cf7a_push_notice( string $message = 'generic', string $type = 'error', bool $dismissible = true ) {
 		$class  = "notice notice-$type";
 		$class .= $dismissible ? ' is-dismissible' : '';
 		$notice = sprintf( '<div class="%s"><p>%s</p></div>', esc_attr( $class ), esc_html( $message ) );
 		set_transient( 'cf7a_notice', $notice );
 	}
 
+	/**
+	 * It exports the blacklist
+	 */
 	public static function cf7a_export_blacklist() {
 		global $wpdb;
 		// phpcs:ignore WordPress.DB.DirectDatabaseQuery.DirectQuery, WordPress.DB.DirectDatabaseQuery.NoCaching
@@ -67,4 +65,38 @@ public function cf7a_handle_actions() {
 			exit();
 		}
 	}
+
+	/**
+	 * It sends an email to the admin
+	 *
+	 * @param string $subject the mail message subject
+	 * @param string $recipient the mail recipient
+	 * @param string $body the mail message content
+	 * @param string $sender the mail message sender
+	 */
+	public function send_email_to_admin( string $subject, string $recipient, string $body, string $sender ) {
+		/**
+		 * Filter cf7-antispam before resend an email who was spammed
+		 *
+		 * @param string $body the mail message content
+		 * @param string $sender the mail message sender
+		 * @param string $subject the mail message subject
+		 * @param string $recipient the mail recipient
+		 *
+		 * @returns string the mail body content
+		 */
+		$body = apply_filters( 'cf7a_before_resend_email', $body, $sender, $subject, $recipient );
+
+		// Set up headers correctly
+		$site_name  = get_bloginfo( 'name' );
+		$from_email = get_option( 'admin_email' );
+
+		$headers  = "From: {$site_name} <{$from_email}>\n";
+		$headers .= "Content-Type: text/html\n";
+		$headers .= "X-WPCF7-Content-Type: text/html\n";
+		$headers .= "Reply-To: {$sender}\n";
+
+		/* send the email */
+		return wp_mail( $recipient, $subject, $body, $headers );
+	}
 }

core/CF7_AntiSpam_Flamingo.php

@@ -2,6 +2,7 @@
 
 namespace CF7_AntiSpam\Core;
 
+use CF7_AntiSpam\Admin\CF7_AntiSpam_Admin_Tools;
 use WP_Query;
 use WPCF7_ContactForm;
 use WPCF7_Submission;
@@ -208,7 +209,7 @@ private static function cf7a_get_mail_field( $flamingo_post, $field ) {
 	 *
 	 * @return array { success: boolean, message: string }
 	 */
-	public function cf7a_resend_mail( $mail_id ) {
+	public function cf7a_resend_mail( int $mail_id ): array {
 		$flamingo_data = new Flamingo_Inbound_Message( $mail_id );
 		$message = self::cf7a_get_mail_field( $flamingo_data, 'message' );
 
@@ -264,29 +265,9 @@ public function cf7a_resend_mail( $mail_id ) {
 			}
 		}
 
-		/**
-		 * Filter cf7-antispam before resend an email who was spammed
-		 *
-		 * @param string $body the mail message content
-		 * @param string $sender the mail message sender
-		 * @param string $subject the mail message subject
-		 * @param string $recipient the mail recipient
-		 *
-		 * @returns string the mail body content
-		 */
-		$body = apply_filters( 'cf7a_before_resend_email', $body, $sender, $subject, $recipient );
-
-		// Set up headers correctly
-		$site_name  = get_bloginfo( 'name' );
-		$from_email = get_option( 'admin_email' );
-
-		$headers  = "From: {$site_name} <{$from_email}>\n";
-		$headers .= "Content-Type: text/html\n";
-		$headers .= "X-WPCF7-Content-Type: text/html\n";
-		$headers .= "Reply-To: {$sender}\n";
-
-		/* send the email */
-		$result = wp_mail( $recipient, $subject, $body, $headers );
+		$tools = new CF7_AntiSpam_Admin_Tools();
+		$result = $tools->send_email_to_admin( $subject, $recipient, $body, $sender );
+
 		if ( $result ) {
 			return array( 'success'=> true, 'message' => __( 'Email sent with success', 'cf7-antispam' ) );
 		}
@@ -295,7 +276,7 @@ public function cf7a_resend_mail( $mail_id ) {
 	}
 
 	/**
-	 * Parse CF7 mail tags in recipient field
+	 * Parse CF7 mail tags in the recipient field
 	 *
 	 * @param string                   $recipient The recipient string that may contain CF7 tags
 	 * @param Flamingo_Inbound_Message $flamingo_data The flamingo message data