Changeset 3485473

Timestamp:

03/18/2026 09:49:57 AM (10 days ago)

Author:

wpexpertsio

Message:

Release 1.0.6

Location:

post-smtp-for-mainwp/trunk

Files:

• includes/class-post-smtp-mwp-page.php (modified) (4 diffs)
• includes/class-post-smtp-mwp-table.php (modified) (1 diff)
• includes/rest-api/v1/class-post-smtp-mwp-rest-api.php (modified) (4 diffs)
• mainwp-post-smtp-extension.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)

post-smtp-for-mainwp/trunk/includes/class-post-smtp-mwp-page.php

@@ -37 +37 @@
             add_action( 'admin_post_post_smtp_mwp_save_sites', array( $this, 'save_sites' ) );
             add_action( 'wp_ajax_post-smtp-request-mwp-child', array( $this, 'request_child' ) );
+            add_action( 'post_smtp_wizard_configuration_saved', array( $this, 'broadcast_configuration_to_children' ) );
         }
 
@@ -294 +295 @@
 
                     $response = wp_remote_post(
-                        "{$site_url}wp-json/psmwp/v1/activate-from-mainwp",
+                        "{$site_url}index.php/wp-json/psmwp/v1/activate-from-mainwp",
                         array(
                             'headers' => array(
@@ -301 +302 @@
                             'body'    => array(
                                 'action' => $what,
+                                'parent_configured' => $this->is_post_smtp_configured()
                             ),
                         )
@@ -357 +359 @@
             }
         }
+
+        /**
+         * Broadcast configuration to children
+         * 
+         * @since 1.0.0
+         * @version 1.0.0
+         */
+        public function broadcast_configuration_to_children() {
+
+            $sites = get_option( 'post_smtp_mainwp_sites' );
+
+            if ( empty( $sites ) ) {
+                return;
+            }
+
+            $child_enabled = apply_filters( 'mainwp_extension_enabled_check', __FILE__ );
+            $child_key     = $child_enabled['key'];
+            $option        = array( 'pubkey' => true );
+
+            foreach ( $sites as $site_id => $site_data ) {
+
+                if ( isset( $site_data['enable_on_child_site'] ) && $site_data['enable_on_child_site'] ) {
+                    
+                    $website = apply_filters( 'mainwp_getdbsites', __FILE__, $child_key, array( $site_id ), array(), $option );
+                    
+                    if( empty( $website ) || ! isset( $website[ $site_id ] ) ) {
+                        continue;
+                    }
+
+                    $website  = $website[ $site_id ];
+                    $api_key  = md5( $website->pubkey );
+                    $site_url = $website->url;
+
+                    wp_remote_post(
+                        "{$site_url}index.php/wp-json/psmwp/v1/activate-from-mainwp",
+                        array(
+                            'headers' => array(
+                                'API-Key' => $api_key,
+                            ),
+                            'body'    => array(
+                                'action' => 'enable_post_smtp',
+                                'parent_configured' => $this->is_post_smtp_configured()
+                            ),
+                            'blocking' => false
+                        )
+                    );
+
+                }
+            }
+
+        }
+
+        /**
+         * Is Post SMTP Configured
+         * 
+         * @return bool
+         * @since 1.0.0
+         * @version 1.0.0
+         */
+        private function is_post_smtp_configured() {
+            
+            $options = get_option( PostmanOptions::POSTMAN_OPTIONS );
+            $transport_type = isset( $options[ PostmanOptions::TRANSPORT_TYPE ] ) ? $options[ PostmanOptions::TRANSPORT_TYPE ] : '';
+            if ( $transport_type !== 'default'  && $transport_type !== '') {
+                return true;
+            }
+            return false;
+            
+        }
     }
 

post-smtp-for-mainwp/trunk/includes/class-post-smtp-mwp-table.php

@@ -168 +168 @@
         public function logs_args( $args ) {
 
-            if ( 'site_id' === $args['order_by'] ) {
-
+            if ( isset( $args['order_by'] ) && 'site_id' === $args['order_by'] ) {
+        
                 $args['order_by'] = 'lm.meta_value';
-
-            }
-
+            }
+        
             return $args;
         }

post-smtp-for-mainwp/trunk/includes/rest-api/v1/class-post-smtp-mwp-rest-api.php

@@ -30 +30 @@
          */
         private $site = false;
+
+        /**
+         * Email log IDs created for the current request (primary + fallback attempts).
+         *
+         * @var array
+         */
+        private $current_log_ids = array();
 
         /**
@@ -130 +137 @@
         public function send_email( WP_REST_Request $request ) {
 
-            $result  = false;
-            $headers = $request->get_headers();
-            $api_key = empty( $request->get_header( 'api_key' ) ) ? '' : sanitize_text_field( $request->get_header( 'api_key' ) );
-            $site_id = empty( $request->get_header( 'site_id' ) ) ? '' : sanitize_text_field( $request->get_header( 'site_id' ) );
+            $result           = false;
+            $headers          = $request->get_headers();
+            $api_key          = empty( $request->get_header( 'api_key' ) ) ? '' : sanitize_text_field( $request->get_header( 'api_key' ) );
+            $site_id          = empty( $request->get_header( 'site_id' ) ) ? '' : sanitize_text_field( $request->get_header( 'site_id' ) );
+            $this->current_log_ids = array();
 
             if ( isset( $_GET['actionnonce'] ) // phpcs:disable WordPress.Security.NonceVerification
@@ -149 +157 @@
                     $result        = apply_filters( 'mainwp_fetchurlverifyaction', __FILE__, $child_key, $this->site_id, $params );
 
-                    // All set, let's send email xD.
-                    if ( is_array( $result ) && ! empty( $result['success'] ) ) {
-
-                        // Override settings if checked in MainWP -> Extensions -> Post SMTP -> Enable Individual Settings.
-                        $this->override_settings();
-
-                        $params      = $request->get_params();
-                        $to          = isset( $params['to'] ) ? $params['to'] : '';
-                        $subject     = isset( $params['subject'] ) ? $params['subject'] : '';
-                        $message     = isset( $params['message'] ) ? $params['message'] : '';
-                        $headers     = isset( $params['headers'] ) ? $params['headers'] : '';
-                        $attachments = isset( $params['attachments'] ) ? $params['attachments'] : array();
-
-                        // Lets upload files on server.
-                        if ( ! empty( $attachments ) ) {
-
-                            $_attachments = $attachments;
-                            $attachments  = array();
-                            foreach ( $_attachments as $key => $attachment ) {
-
-                                // Get the contents of the file.
-                                $file_info     = pathinfo( $key );
-                                $absolute_path = strstr( $file_info['dirname'], 'uploads/' );
-                                $absolute_path = str_replace( 'uploads', '', $absolute_path );
-                                $absolute_path = '/';
-
-                                // Define the filename and destination directory.
-                                $filename   = $file_info['basename'];
-                                $upload_dir = wp_upload_dir();
-
-                                // Create the file in the upload directory.
-                                $file_path   = $upload_dir['path'] . $absolute_path . $filename;
-                                $file_url    = $upload_dir['url'] . $absolute_path . $filename;
-                                $wp_filetype = wp_check_filetype( $filename, null );
-                                $file_data   = wp_upload_bits( $filename, null, $attachment );
-
-                                // Check if the file was successfully uploaded.
-                                if ( ! $file_data['error'] ) {
-                                    // The file was uploaded successfully.
-                                    // Insert the file into the media library.
-                                    $attachment = array(
-                                        'post_mime_type' => $wp_filetype['type'],
-                                        'post_title'     => sanitize_file_name( $filename ),
-                                        'post_content'   => '',
-                                        'post_status'    => 'inherit',
-                                    );
-
-                                    $attachment_id = wp_insert_attachment( $attachment, $file_data['file'] );
-
-                                    $attachments[] = $file_path;
-
+                    if ( ! is_array( $result ) || empty( $result['success'] ) ) {
+
+                        wp_send_json_error(
+                            array(
+                                'message' => __( 'MainWP verification failed, email not sent.', 'post-smtp' ),
+                            ),
+                            403
+                        );
+                    }
+
+                    // All set, let's send email.
+                    // Override settings if checked in MainWP -> Extensions -> Post SMTP -> Enable Individual Settings.
+                    $this->override_settings();
+
+                    $params      = $request->get_params();
+                    $to          = isset( $params['to'] ) ? $params['to'] : '';
+                    $subject     = isset( $params['subject'] ) ? $params['subject'] : '';
+                    $message     = isset( $params['message'] ) ? $params['message'] : '';
+                    $headers     = isset( $params['headers'] ) ? $params['headers'] : '';
+                    $attachments = isset( $params['attachments'] ) ? $params['attachments'] : array();
+
+                    // Lets upload files on server.
+                    if ( ! empty( $attachments ) ) {
+
+                        $_attachments = $attachments;
+                        $attachments  = array();
+                        foreach ( $_attachments as $key => $attachment ) {
+
+                            // Get the contents of the file.
+                            $file_info     = pathinfo( $key );
+                            $absolute_path = strstr( $file_info['dirname'], 'uploads/' );
+                            $absolute_path = str_replace( 'uploads', '', $absolute_path );
+                            $absolute_path = '/';
+
+                            // Define the filename and destination directory.
+                            $filename   = $file_info['basename'];
+                            $upload_dir = wp_upload_dir();
+
+                            // Create the file in the upload directory.
+                            $file_path   = $upload_dir['path'] . $absolute_path . $filename;
+                            $file_url    = $upload_dir['url'] . $absolute_path . $filename;
+                            $wp_filetype = wp_check_filetype( $filename, null );
+                            $file_data   = wp_upload_bits( $filename, null, $attachment );
+
+                            // Check if the file was successfully uploaded.
+                            if ( ! $file_data['error'] ) {
+                                // The file was uploaded successfully.
+                                // Insert the file into the media library.
+                                $attachment = array(
+                                    'post_mime_type' => $wp_filetype['type'],
+                                    'post_title'     => sanitize_file_name( $filename ),
+                                    'post_content'   => '',
+                                    'post_status'    => 'inherit',
+                                );
+
+                                $attachment_id = wp_insert_attachment( $attachment, $file_data['file'] );
+
+                                $attachments[] = $file_path;
+
+                            }
+                        }
+                    }
+
+                    $mail_result = wp_mail( $to, $subject, $message, $headers, $attachments );
+
+                    $logs_data = array();
+                    $last_log  = null;
+
+                    if ( ! empty( $this->current_log_ids ) ) {
+                        // Load log details for this send (primary + fallback attempts) so we can return them to the child site.
+                        if ( ! class_exists( 'PostmanEmailQueryLog' ) && defined( 'POST_SMTP_PATH' ) ) {
+                            require_once POST_SMTP_PATH . '/Postman/Postman-Email-Log/PostmanEmailQueryLog.php';
+                        }
+
+                        if ( class_exists( 'PostmanEmailQueryLog' ) ) {
+                            $email_query_log = new PostmanEmailQueryLog();
+
+                            foreach ( $this->current_log_ids as $log_id ) {
+                                $log_row = $email_query_log->get_log( $log_id );
+
+                                if ( is_array( $log_row ) ) {
+                                    $logs_data[] = $log_row;
+                                    $last_log    = $log_row;
                                 }
                             }
                         }
-
-                        $result = wp_mail( $to, $subject, $message, $headers, $attachments );
-
+                    }
+
+                    $last_log_id = ! empty( $this->current_log_ids ) ? end( $this->current_log_ids ) : 0;
+
+                    if ( $mail_result ) {
+                        wp_send_json_success(
+                            array(
+                                'message'  => __( 'Email sent successfully from MainWP dashboard site.', 'post-smtp' ),
+                                // Backwards-compatible single-log fields.
+                                'log_id'   => $last_log_id,
+                                'log'      => $last_log,
+                                // New: full set of logs for this send (primary + fallback attempts).
+                                'log_ids'  => $this->current_log_ids,
+                                'logs'     => $logs_data,
+                            ),
+                            200
+                        );
+                    } else {
+                        wp_send_json_error(
+                            array(
+                                'message'  => __( 'Email sending failed on MainWP dashboard site.', 'post-smtp' ),
+                                // Backwards-compatible single-log fields.
+                                'log_id'   => $last_log_id,
+                                'log'      => $last_log,
+                                // New: full set of logs for this send (primary + fallback attempts).
+                                'log_ids'  => $this->current_log_ids,
+                                'logs'     => $logs_data,
+                            ),
+                            500
+                        );
                     }
                 }
             }
 
-            return $result;
+            // If we reached here, something in the initial validation failed.
+            wp_send_json_error(
+                array(
+                    'message' => __( 'Invalid request, email not sent.', 'post-smtp' ),
+                ),
+                400
+            );
         }
 
@@ -224 +297 @@
 
             // Store Site ID, if log has been created :).
+            $this->current_log_ids[] = (int) $log_id;
+
             if ( $this->site_id ) {
 

post-smtp-for-mainwp/trunk/mainwp-post-smtp-extension.php

@@ -4 +4 @@
  * Plugin URI: https://mainwp.com/extension/post-smtp/
  * Description: MainWP Post SMTP extension allows you to manage SMTP of you all your child sites from one central location.
- * Version: 1.0.5
+ * Version: 1.0.6
  * Author: Post SMTP
  * Text Domain: post-smtp

post-smtp-for-mainwp/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 4.7
 Tested up to: 6.9
-Stable tag: 1.0.5
+Stable tag: 1.0.6
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -119 +119 @@
 == Changelog ==
 
-= 1.0.5 Feb 19, 2026 =
+= 1.0.6 - Mar 18, 2026 =
+* TWEAK – Sync button in the header to synchronize all settings from the parent to child sites directly from the MainWP dashboard.
+* TWEAK – Added compatibility for email failure alerts.
+* FIX – Resolved an issue with email log synchronization from child sites to the parent site.
+
+= 1.0.5 - Feb 19, 2026 =
 * Reverted the last update.
 
-= 1.0.4 Feb 19, 2026 =
+= 1.0.4 - Feb 19, 2026 =
 * TWEAK – Sync button in the header to synchronize all settings from the parent to child sites directly from the MainWP dashboard.
 * TWEAK – Added compatibility for email failure alerts.