Changeset 3337689

Timestamp:

08/01/2025 09:44:50 AM (7 months ago)

Author:

connectzaib

Message:

Updated plugin to version 1.3.2 optimized original info

Location:

test-email-redirector/trunk

Files:

• readme.txt (modified) (1 diff)
• test-email-redirector.php (modified) (7 diffs)

test-email-redirector/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 6.8
 Requires PHP: 7.2
-Stable tag: 1.2.0
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html

test-email-redirector/trunk/test-email-redirector.php

@@ -3 +3 @@
  * Plugin Name: Test Email Redirector
  * Description: Redirects all outgoing WordPress emails to a specified test address and optionally adds CC/BCC. If fields are left blank, they will be removed. Configurable in the Tools menu.
- * Version: 1.2.0
+ * Version: 1.3.2
  * Author: Zaib Makda
  * Author URI: https://profiles.wordpress.org/connectzaib/
@@ -99 +99 @@
                     <td>
                         <input type="checkbox" name="zbet_email_forwarder_enabled" value="1" <?php checked( get_option( 'zbet_email_forwarder_enabled', false ), 1 ); ?> />
-                        <p class="description"><?php echo esc_html__( 'Enable or disable email redirection without deactivating the plugin.', 'test-email-redirector' ); ?></p>
+                        <p class="description" style="display: inline-block;"><?php echo esc_html__( 'Enable or disable email redirection without deactivating the plugin.', 'test-email-redirector' ); ?></p>
                     </td>
                 </tr>
@@ -127 +127 @@
                     <td>
                         <input type="checkbox" name="zbet_email_forwarder_send_original_info" value="1" <?php checked( get_option( 'zbet_email_forwarder_send_original_info', false ), 1 ); ?> />
-                        <p class="description"><?php echo esc_html__( 'Include original recipient information in the forwarded email.', 'test-email-redirector' ); ?></p>
+                        <p class="description" style="display: inline-block;"><?php echo esc_html__( 'Include original recipient information in the forwarded email.', 'test-email-redirector' ); ?></p>
                     </td>
                 </tr>
@@ -170 +170 @@
 );
 
+
 // Modify outgoing emails.
 add_filter(
     'wp_mail',
     function ( $args ) {
+
         $enabled = get_option( 'zbet_email_forwarder_enabled', false );
 
@@ -185 +187 @@
         }
 
-        $cc_emails          = array_filter( array_map( 'sanitize_email', explode( ',', get_option( 'zbet_email_forwarder_cc', '' ) ) ) );
-        $bcc_emails         = array_filter( array_map( 'sanitize_email', explode( ',', get_option( 'zbet_email_forwarder_bcc', '' ) ) ) );
+        $ovveride_bcc = get_option( 'zbet_email_forwarder_bcc', '' );
+        $ovveride_cc  = get_option( 'zbet_email_forwarder_cc', '' );
+
+        $original_to     = $args['to'];
+        $args['to']      = $test_email;
+        $args['subject'] = '[TEST REDIRECT] ' . $args['subject'];
+
         $send_original_info = get_option( 'zbet_email_forwarder_send_original_info', false );
 
-        $original_to  = $args['to'];
-        $original_cc  = isset( $args['cc'] ) ? $args['cc'] : '';
-        $original_bcc = isset( $args['bcc'] ) ? $args['bcc'] : '';
-
-        $args['to']      = $test_email;
-        $args['cc']      = ! empty( $cc_emails ) ? $cc_emails : array();
-        $args['bcc']     = ! empty( $bcc_emails ) ? $bcc_emails : array();
-        $args['subject'] = '[TEST REDIRECT] ' . $args['subject'];
-
+        $original_info = array();
         if ( $send_original_info ) {
-            $original_info  = "\n\n--- Original Recipients ---\n";
-            $original_info .= 'To: ' . implode( ', ', (array) $original_to ) . "\n";
-            $original_info .= 'CC: ' . implode( ', ', (array) $original_cc ) . "\n";
-            $original_info .= 'BCC: ' . implode( ', ', (array) $original_bcc ) . "\n";
-
-            $args['message'] .= '<br><br>' . nl2br( esc_html( $original_info ) );
+            $original_info[] = '--- Original Recipients ---';
+            $original_info[] = 'To: ' . implode( ', ', (array) $original_to );
+        }
+
+        if ( empty( $args['headers'] ) ) {
+            return $args;
+        }
+
+        if ( is_array( $args['headers'] ) ) {
+
+            if ( ! empty( $args['headers']['Bcc'] ) ) {
+
+                // BCC is there.
+                if ( $send_original_info ) {
+                    $original_info[] = str_replace( 'Bcc: ', 'BCC: ', $args['headers']['Bcc'] );
+                }
+
+                // Remove Original Bcc from the headers.
+                unset( $args['headers']['Bcc'] );
+
+                // Check if we have to overided the BCC.
+                if ( ! empty( $ovveride_bcc ) ) {
+                    $args['headers']['Bcc'] = "Bcc: $ovveride_bcc";
+                }
+            }
+
+            if ( ! empty( $args['headers']['Cc'] ) ) {
+
+                // CC is there.
+                if ( $send_original_info ) {
+                    $original_info[] = str_replace( 'Cc: ', 'CC: ', $args['headers']['Cc'] );
+                }
+
+                // Remove Original Cc from the headers.
+                unset( $args['headers']['Cc'] );
+
+                // Check if we have to overided the BCC.
+                if ( ! empty( $ovveride_cc ) ) {
+                    $args['headers']['Cc'] = "Cc: $ovveride_cc";
+                }
+            }
+        } else {
+
+            // It's a string.
+            $args['headers'] = explode( "\n", str_replace( "\r\n", "\n", $args['headers'] ) );
+            $contains_bcc    = false;
+            $contains_cc     = false;
+
+            // Checked if headers contains BCC.
+            $new_headers   = array();
+            $original_bccs = array();
+            $original_ccs  = array();
+            foreach ( $args['headers'] as $header ) {
+
+                $trimmed = trim( $header );
+
+                if ( empty( $trimmed ) ) {
+                    // Skip empty lines.
+                    continue;
+                }
+
+                if ( stripos( $trimmed, 'Bcc:' ) === 0 || stripos( $trimmed, 'bcc:' ) ) {
+                    // BCC is there.
+                    $contains_bcc = true;
+                    $original_bcc = ' ' . str_replace( array( 'bcc: ', '\\r\\n', ',' ), '', strtolower( $trimmed ) );
+
+                    if ( $send_original_info ) {
+                        $original_bccs[] = $original_bcc;
+                    }
+                    // Skip BCC.
+                    continue;
+                }
+
+                if ( stripos( $trimmed, 'Cc:' ) === 0 || stripos( $trimmed, 'cc:' ) === 0 ) {
+                    // CC is there.
+                    $contains_cc = true;
+                    $original_cc = ' ' . str_replace( array( 'cc: ', '\\r\\n', ',' ), '', strtolower( $trimmed ) );
+                    if ( $send_original_info ) {
+                        $original_ccs[] = $original_cc;
+                    }
+                    // Skip CC.
+                    continue;
+                }
+
+                $new_headers[] = $trimmed;
+            }
+
+            if ( ! empty( $original_bccs ) ) {
+                // Add original BCCs to the message.
+                $original_info[] = 'BCC: ' . implode( ', ', array_unique( $original_bccs ) );
+            }
+
+            if ( ! empty( $original_ccs ) ) {
+                // Add original BCCs to the message.
+                $original_info[] = 'CC: ' . implode( ', ', array_unique( $original_ccs ) );
+            }
+
+            // Check if we have to overided the BCC.
+            if ( $contains_bcc && ! empty( $ovveride_bcc ) ) {
+                $new_headers[] = 'Bcc: ' . $ovveride_bcc;
+            }
+
+            // Check if we have to overided the CC.
+            if ( $contains_cc && ! empty( $ovveride_cc ) ) {
+                $new_headers[] = 'Cc: ' . $ovveride_cc;
+            }
+
+            $args['headers'] = $new_headers;
+
+        }
+
+        if ( $send_original_info && ! empty( $original_info ) ) {
+            $args['message'] .= '<br/><br/>';
+            foreach ( $original_info as $value ) {
+                $args['message'] .= wp_kses_post( $value ) . '<br/>';
+            }
         }
 
@@ -211 +320 @@
     PHP_INT_MAX
 );
-
 // Add settings link on the Plugins page.
 add_filter(
@@ -222 +330 @@
 );
 
-
 // Cleanup settings on plugin deletion.
 register_uninstall_hook( __FILE__, 'zbet_email_forwarder_cleanup' );
-
 function zbet_email_forwarder_cleanup() {
     delete_option( 'zbet_email_forwarder_email' );