WordPress.org
Get WordPress

Plugin Directory

Changeset 3019137


Ignore:
Timestamp:
01/09/2024 09:26:24 AM (2 years ago)
Author:
juvodesign
Message:

Update to version 3.1.2 from GitHub

Location:
juvo-mail-editor
Files:
2 added
14 edited
1 copied

Legend:

Unmodified
Added
Removed

  • juvo-mail-editor/tags/3.1.2/juvo-mail-editor.php

    r2982661 r3019137  
    88 * Text Domain:     juvo-mail-editor
    99 * Domain Path:     /languages
    10  * Version:         3.1.1
     10 * Version:         3.1.2
    1111 * Requires at least: 6.2
    1212 * Requires PHP: 7.4

  • juvo-mail-editor/tags/3.1.2/readme.txt

    r2982661 r3019137  
    44License: GPLv2 or later
    55Tested up to: 6.3
    6 Stable tag: 3.1.1
     6Stable tag: 3.1.2
    77
    88JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

  • juvo-mail-editor/tags/3.1.2/src/Mail_Editor.php

    r2981043 r3019137  
    55
    66use JUVO_MailEditor\Admin\Admin;
     7use JUVO_MailEditor\Integrations\WS_Form;
    78use JUVO_MailEditor\Mails\New_User;
    89use JUVO_MailEditor\Mails\New_User_Admin;
    … …  
    125126         */
    126127        $relay = new Relay();
    127         $this->loader->add_action("juvo_mail_editor_send", $relay, 'send_mails_action_callback', 10, 2);
    128         $this->loader->add_filter("wp_mail", $relay, 'wpmail_filter_callback', 10, 1);
     128        $this->loader->add_action( "juvo_mail_editor_send", $relay, 'send_mails_action_callback', 10, 2 );
     129        $this->loader->add_filter( "wp_mail", $relay, 'wpmail_filter_callback', 10, 1 );
    129130
    130131        /**
    … …  
    136137         * User Locale
    137138         */
    138         $this->loader->add_filter('juvo_mail_editor_user_language', new Integrations\Language(), 'getUserLocale', 10, 2);
    139         $this->loader->add_filter('juvo_mail_editor_user_language', new Integrations\WPML(), 'getUserLocale', 20, 2);
     139        $this->loader->add_filter( 'juvo_mail_editor_user_language', new Integrations\Language(), 'getUserLocale', 10, 2 );
     140        $this->loader->add_filter( 'juvo_mail_editor_user_language', new Integrations\WPML(), 'getUserLocale', 20, 2 );
    140141
    141142        /**
    … …  
    164165        $this->loader->add_filter( 'wp_mail', new Integrations\BuddyBoss(), 'useTemplate', 99, 1 );
    165166        $this->loader->add_filter( 'user_activation_notification_message', new Integrations\Formidable_Forms\Confirm_User(), 'prepareSend', 99, 3 );
     167        $wsf = new WS_Form();
     168        $this->loader->add_filter( 'wsf_action_email_headers', $wsf, 'header_filter_callback', 10, 4 );
     169
    166170    }
    167171
    … …  
    184188     * @access   private
    185189     */
    186     private function define_public_hooks() {
    187     }
     190    private function define_public_hooks() {}
    188191
    189192    /**

  • juvo-mail-editor/tags/3.1.2/src/Mails/Password_Changed.php

    r2981043 r3019137  
    44namespace JUVO_MailEditor\Mails;
    55
    6 use CMB2;
    76use JUVO_MailEditor\Mail_Generator;
    8 use JUVO_MailEditor\Mail_Trigger_TAX;
    9 use JUVO_MailEditor\Mails_PT;
    107use JUVO_MailEditor\Trigger_Registry;
    118use WP_User;
    129
     10/**
     11 * Class Password_Changed
     12 *
     13 * Triggered after the user changed his password. By default only triggered on the profile page
     14 */
    1315class Password_Changed extends Mail_Generator {
    1416

  • juvo-mail-editor/tags/3.1.2/src/Mails/Password_Changed_Admin.php

    r2981043 r3019137  
    99use WP_User;
    1010
     11/**
     12 * Class Password_Changed_Admin
     13 *
     14 * Triggered after the user changed his password. By default only triggered when using the password reset form, not on the profile page
     15 */
    1116class Password_Changed_Admin extends Mail_Generator {
    1217
    … …  
    2833
    2934    protected function getMailArrayHook(): string {
    30         return "retrieve_password_notification_email";
     35        return "wp_password_change_notification_email";
    3136    }
    3237

  • juvo-mail-editor/tags/3.1.2/src/Trigger.php

    r2981043 r3019137  
    125125     * @return array
    126126     */
    127     public function addTriggerToHeader( array $args ): array {
     127    public function addTriggerMailArray( array $args ): array {
    128128
    129         // Enforce headers to be array
    130         if ( ! empty( $args['headers'] ) && is_string( $args['headers'] ) ) {
    131             $args['headers'] = explode( "\n", str_replace( "\r\n", "\n", $args['headers'] ) );
    132         } elseif(empty($args['headers'])) {
    133             $args['headers'] = [];
     129        if (!empty($args['headers'])) {
     130            // Format back to string since some smtp plugins do not support arrays
     131            $args['headers'] = implode("\r\n", $this->addTriggerMailArray($args['headers']));
    134132        }
    135 
    136         $args['headers'][] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
    137 
    138         // Format back to string since some smtp plugins do not support arrays
    139         $args['headers'] = implode("\r\n", $args['headers']);
    140133
    141134        return $args;
    … …  
    143136    }
    144137
     138    /**
     139     * Adds template slug as header to mark the mails to be processed later
     140     *
     141     * @param array|string $headers
     142     *
     143     * @return array
     144     */
     145    public function addTriggerToHeader( $headers ): array {
     146
     147        // Ensure string or array
     148        if (!is_array($headers) && !is_string($headers)) {
     149            return $headers;
     150        }
     151
     152        // Exit early
     153        if (empty($headers)) {
     154            return $headers;
     155        }
     156
     157        if ( is_string( $headers ) ) {
     158            $headers = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
     159        }
     160
     161        $headers[] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
     162
     163        return $headers;
     164
     165    }
     166
    145167}

  • juvo-mail-editor/tags/3.1.2/vendor/composer/installed.php

    r2982661 r3019137  
    22    'root' => array(
    33        'name' => 'juvo/mail-editor',
    4         'pretty_version' => '3.1.1',
    5         'version' => '3.1.1.0',
    6         'reference' => 'ce114762be180296a2cf99a0105ad53c64b541f4',
     4        'pretty_version' => '3.1.2',
     5        'version' => '3.1.2.0',
     6        'reference' => '7a8075f2a412a0024ff91a2e625c143c0c609c52',
    77        'type' => 'wordpress-plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    3939        ),
    4040        'juvo/mail-editor' => array(
    41             'pretty_version' => '3.1.1',
    42             'version' => '3.1.1.0',
    43             'reference' => 'ce114762be180296a2cf99a0105ad53c64b541f4',
     41            'pretty_version' => '3.1.2',
     42            'version' => '3.1.2.0',
     43            'reference' => '7a8075f2a412a0024ff91a2e625c143c0c609c52',
    4444            'type' => 'wordpress-plugin',
    4545            'install_path' => __DIR__ . '/../../',

  • juvo-mail-editor/trunk/juvo-mail-editor.php

    r2982661 r3019137  
    88 * Text Domain:     juvo-mail-editor
    99 * Domain Path:     /languages
    10  * Version:         3.1.1
     10 * Version:         3.1.2
    1111 * Requires at least: 6.2
    1212 * Requires PHP: 7.4

  • juvo-mail-editor/trunk/readme.txt

    r2982661 r3019137  
    44License: GPLv2 or later
    55Tested up to: 6.3
    6 Stable tag: 3.1.1
     6Stable tag: 3.1.2
    77
    88JUVO Mail Editor helps to modify the standard WordPress Mailings and allows adding dynamic mail triggers.

  • juvo-mail-editor/trunk/src/Mail_Editor.php

    r2981043 r3019137  
    55
    66use JUVO_MailEditor\Admin\Admin;
     7use JUVO_MailEditor\Integrations\WS_Form;
    78use JUVO_MailEditor\Mails\New_User;
    89use JUVO_MailEditor\Mails\New_User_Admin;
    … …  
    125126         */
    126127        $relay = new Relay();
    127         $this->loader->add_action("juvo_mail_editor_send", $relay, 'send_mails_action_callback', 10, 2);
    128         $this->loader->add_filter("wp_mail", $relay, 'wpmail_filter_callback', 10, 1);
     128        $this->loader->add_action( "juvo_mail_editor_send", $relay, 'send_mails_action_callback', 10, 2 );
     129        $this->loader->add_filter( "wp_mail", $relay, 'wpmail_filter_callback', 10, 1 );
    129130
    130131        /**
    … …  
    136137         * User Locale
    137138         */
    138         $this->loader->add_filter('juvo_mail_editor_user_language', new Integrations\Language(), 'getUserLocale', 10, 2);
    139         $this->loader->add_filter('juvo_mail_editor_user_language', new Integrations\WPML(), 'getUserLocale', 20, 2);
     139        $this->loader->add_filter( 'juvo_mail_editor_user_language', new Integrations\Language(), 'getUserLocale', 10, 2 );
     140        $this->loader->add_filter( 'juvo_mail_editor_user_language', new Integrations\WPML(), 'getUserLocale', 20, 2 );
    140141
    141142        /**
    … …  
    164165        $this->loader->add_filter( 'wp_mail', new Integrations\BuddyBoss(), 'useTemplate', 99, 1 );
    165166        $this->loader->add_filter( 'user_activation_notification_message', new Integrations\Formidable_Forms\Confirm_User(), 'prepareSend', 99, 3 );
     167        $wsf = new WS_Form();
     168        $this->loader->add_filter( 'wsf_action_email_headers', $wsf, 'header_filter_callback', 10, 4 );
     169
    166170    }
    167171
    … …  
    184188     * @access   private
    185189     */
    186     private function define_public_hooks() {
    187     }
     190    private function define_public_hooks() {}
    188191
    189192    /**

  • juvo-mail-editor/trunk/src/Mails/Password_Changed.php

    r2981043 r3019137  
    44namespace JUVO_MailEditor\Mails;
    55
    6 use CMB2;
    76use JUVO_MailEditor\Mail_Generator;
    8 use JUVO_MailEditor\Mail_Trigger_TAX;
    9 use JUVO_MailEditor\Mails_PT;
    107use JUVO_MailEditor\Trigger_Registry;
    118use WP_User;
    129
     10/**
     11 * Class Password_Changed
     12 *
     13 * Triggered after the user changed his password. By default only triggered on the profile page
     14 */
    1315class Password_Changed extends Mail_Generator {
    1416

  • juvo-mail-editor/trunk/src/Mails/Password_Changed_Admin.php

    r2981043 r3019137  
    99use WP_User;
    1010
     11/**
     12 * Class Password_Changed_Admin
     13 *
     14 * Triggered after the user changed his password. By default only triggered when using the password reset form, not on the profile page
     15 */
    1116class Password_Changed_Admin extends Mail_Generator {
    1217
    … …  
    2833
    2934    protected function getMailArrayHook(): string {
    30         return "retrieve_password_notification_email";
     35        return "wp_password_change_notification_email";
    3136    }
    3237

  • juvo-mail-editor/trunk/src/Trigger.php

    r2981043 r3019137  
    125125     * @return array
    126126     */
    127     public function addTriggerToHeader( array $args ): array {
     127    public function addTriggerMailArray( array $args ): array {
    128128
    129         // Enforce headers to be array
    130         if ( ! empty( $args['headers'] ) && is_string( $args['headers'] ) ) {
    131             $args['headers'] = explode( "\n", str_replace( "\r\n", "\n", $args['headers'] ) );
    132         } elseif(empty($args['headers'])) {
    133             $args['headers'] = [];
     129        if (!empty($args['headers'])) {
     130            // Format back to string since some smtp plugins do not support arrays
     131            $args['headers'] = implode("\r\n", $this->addTriggerMailArray($args['headers']));
    134132        }
    135 
    136         $args['headers'][] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
    137 
    138         // Format back to string since some smtp plugins do not support arrays
    139         $args['headers'] = implode("\r\n", $args['headers']);
    140133
    141134        return $args;
    … …  
    143136    }
    144137
     138    /**
     139     * Adds template slug as header to mark the mails to be processed later
     140     *
     141     * @param array|string $headers
     142     *
     143     * @return array
     144     */
     145    public function addTriggerToHeader( $headers ): array {
     146
     147        // Ensure string or array
     148        if (!is_array($headers) && !is_string($headers)) {
     149            return $headers;
     150        }
     151
     152        // Exit early
     153        if (empty($headers)) {
     154            return $headers;
     155        }
     156
     157        if ( is_string( $headers ) ) {
     158            $headers = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
     159        }
     160
     161        $headers[] = "X-JUVO-ME-Trigger: {$this->getSlug()}";
     162
     163        return $headers;
     164
     165    }
     166
    145167}

  • juvo-mail-editor/trunk/vendor/composer/installed.php

    r2982661 r3019137  
    22    'root' => array(
    33        'name' => 'juvo/mail-editor',
    4         'pretty_version' => '3.1.1',
    5         'version' => '3.1.1.0',
    6         'reference' => 'ce114762be180296a2cf99a0105ad53c64b541f4',
     4        'pretty_version' => '3.1.2',
     5        'version' => '3.1.2.0',
     6        'reference' => '7a8075f2a412a0024ff91a2e625c143c0c609c52',
    77        'type' => 'wordpress-plugin',
    88        'install_path' => __DIR__ . '/../../',
    … …  
    3939        ),
    4040        'juvo/mail-editor' => array(
    41             'pretty_version' => '3.1.1',
    42             'version' => '3.1.1.0',
    43             'reference' => 'ce114762be180296a2cf99a0105ad53c64b541f4',
     41            'pretty_version' => '3.1.2',
     42            'version' => '3.1.2.0',
     43            'reference' => '7a8075f2a412a0024ff91a2e625c143c0c609c52',
    4444            'type' => 'wordpress-plugin',
    4545            'install_path' => __DIR__ . '/../../',
Note: See TracChangeset for help on using the changeset viewer.