Changeset 3754846

Timestamp:

10/19/2026 01:39:29 PM (3 weeks ago)

Author:

everpress

Message:

Update to version 2.1.0 from GitHub

Location:

mailster-gravity-forms

Files:

• tags/2.1.0 (copied) (copied from mailster-gravity-forms/trunk )
• tags/2.1.0/README.md (deleted)
• tags/2.1.0/assets/style.css (modified) (2 diffs)
• tags/2.1.0/classes/gravity.class.php (modified) (10 diffs)
• tags/2.1.0/mailster-gravity-forms.php (modified) (1 diff)
• tags/2.1.0/package.json (added)
• tags/2.1.0/views/page.php (modified) (7 diffs)
• trunk/README.md (deleted)
• trunk/assets/style.css (modified) (2 diffs)
• trunk/classes/gravity.class.php (modified) (10 diffs)
• trunk/mailster-gravity-forms.php (modified) (1 diff)
• trunk/package.json (added)
• trunk/views/page.php (modified) (7 diffs)

mailster-gravity-forms/tags/2.1.0/assets/style.css

@@ -2 +2 @@
         border-bottom: 1px solid #ccc;
 }
+
 #mailster-map li label {
         display: inline-block;
         width: 150px;
 }
+
 #mailster-map li label select {
         display: inline-block;
         width: 200px;
 }
+
 #mailster-map li ul li {
         border-bottom: 0;
         padding-left: 20px;
 }
+
 .gform-icon--mailster {
         background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 949.9 778.9"><path d="M645.9 0L475 209 304 0H0v778.9h266V342l209 284.9L683.9 342v436.9h266V0z"/></svg>');
@@ -21 +25 @@
         width: 26px;
 }
+
+/* Gravity Forms renders this settings tab id. */
+/* stylelint-disable-next-line selector-id-pattern */
 #tab_mailster .gform-settings-panel__content select {
         width: auto;

mailster-gravity-forms/tags/2.1.0/classes/gravity.class.php

@@ -1 +1 @@
 <?php
-
+/**
+ * Gravity Forms integration for Mailster.
+ *
+ * @package Mailster_Gravity_Forms
+ */
+
+/**
+ * Connects Gravity Forms submissions to Mailster subscribers.
+ *
+ * @since 1.0
+ */
 class MailsterGravitiyForm {
 
+        /**
+         * Absolute filesystem path of this plugin.
+         *
+         * @since 1.0
+         *
+         * @var string
+         */
         private $plugin_path;
+
+        /**
+         * Base URL of this plugin.
+         *
+         * @since 1.0
+         *
+         * @var string
+         */
         private $plugin_url;
 
+        /**
+         * Registers lifecycle hooks and loads the text domain.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function __construct() {
 
@@ -17 +49 @@
 
                 add_action( 'plugins_loaded', array( &$this, 'init' ) );
-
-        }
-
+        }
+
+        /**
+         * Fires when the plugin is activated.
+         *
+         * @since 1.0
+         *
+         * @param bool $network_wide Whether the plugin is being activated network-wide.
+         * @return void
+         */
         public function activate( $network_wide ) {}
 
+        /**
+         * Fires when the plugin is deactivated.
+         *
+         * @since 1.0
+         *
+         * @param bool $network_wide Whether the plugin is being deactivated network-wide.
+         * @return void
+         */
         public function deactivate( $network_wide ) {}
 
+        /**
+         * Registers Gravity Forms hooks for submissions and form settings.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function init() {
 
@@ -30 +84 @@
                 if ( is_admin() ) {
 
-                        add_filter( 'gform_form_settings_menu', array( &$this, 'settings_menu' ), 10, 2 );
+                        add_filter( 'gform_form_settings_menu', array( &$this, 'settings_menu' ) );
                         add_action( 'gform_form_settings_page_mailster', array( &$this, 'settings_page' ) );
 
-                        if ( isset( $_POST['gform_save_settings'] ) ) {
-                                $this->save();
-                        }
-                }
-        }
-
+                        $this->save();
+                }
+        }
+
+        /**
+         * Creates or updates a Mailster subscriber from a Gravity Forms entry.
+         *
+         * Respects the form's list mapping, conditional field, and double opt-in settings.
+         *
+         * @since 1.0
+         *
+         * @param array $entry Submitted Gravity Forms entry.
+         * @param array $form  Gravity Forms form meta, including Mailster settings.
+         * @return void
+         */
         public function after_submission( $entry, $form ) {
 
@@ -62 +125 @@
                         if ( isset( $form['mailster']['conditional_id'] ) ) {
 
-                                if ( isset( $entry[ $form['mailster']['conditional_id'] ] ) && ( $entry[ $form['mailster']['conditional_id'] ] != $form['mailster']['conditional_field'] ) ) {
-                                        return;
-                                }
-                                if ( ! isset( $entry[ $form['mailster']['conditional_id'] ] ) ) {
+                                $conditional_id = $form['mailster']['conditional_id'];
+                                if ( isset( $entry[ $conditional_id ] ) && (string) $entry[ $conditional_id ] !== (string) $form['mailster']['conditional_field'] ) {
+                                        return;
+                                }
+                                if ( ! isset( $entry[ $conditional_id ] ) ) {
                                         return;
                                 }
@@ -85 +149 @@
 
                 foreach ( $form['mailster']['map'] as $field_id => $key ) {
-                        if ( '_list' == $key ) {
+                        if ( '_list' === $key ) {
                                 $listname = $entry[ $field_id ];
                                 if ( empty( $listname ) ) {
@@ -96 +160 @@
                                         $list_ids[] = $list_id;
                                 }
-                        } elseif ( $key != -1 ) {
+                        } elseif ( '-1' !== (string) $key ) {
                                 $userdata[ $key ] = $entry[ $field_id ];
                         }
@@ -105 +169 @@
                 }
 
-                if ( $subscriber = mailster( 'subscribers' )->get_by_mail( $userdata['email'] ) ) {
+                $subscriber = mailster( 'subscribers' )->get_by_mail( $userdata['email'] );
+                if ( $subscriber ) {
+                        $userdata['ID']          = (int) $subscriber->ID;
+                        $userdata['hash']        = $subscriber->hash;
                         $userdata['status']      = $subscriber->status;
-                        $subscriber_notification = $subscriber->status == 0; // send again if not confirmed already,
+                        $subscriber_notification = 0 === (int) $subscriber->status; // send again if not confirmed already.
+
+                        // add() strips the ID on the front end. When the duplicate-key update
+                        // changes nothing, insert_id is 0 and send_confirmations() emails every
+                        // pending subscriber. Updating by ID keeps the resend on this subscriber.
+                        $subscriber_id = mailster( 'subscribers' )->update( $userdata, true, true, $subscriber_notification );
                 } else {
                         $userdata['status']      = isset( $form['mailster']['double-opt-in'] ) ? 0 : 1;
                         $subscriber_notification = true;
-                }
-
-                $overwrite     = true;
-                $merge         = true;
-                $subscriber_id = mailster( 'subscribers' )->add( $userdata, $overwrite, $merge, $subscriber_notification );
+                        $subscriber_id           = mailster( 'subscribers' )->add( $userdata, true, true, $subscriber_notification );
+                }
 
                 if ( ! is_wp_error( $subscriber_id ) ) {
                         mailster( 'subscribers' )->assign_lists( $subscriber_id, $list_ids, false, $userdata['status'] ? true : false );
                 }
-
-        }
-
+        }
+
+        /**
+         * Prints the Mailster panel on the Gravity Forms settings screen.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function settings_page() {
 
@@ -132 +207 @@
         }
 
-        public function settings_menu( $settings_tabs, $form_id ) {
+        /**
+         * Adds the Mailster tab to a form's settings menu.
+         *
+         * @since 1.0
+         *
+         * @param array $settings_tabs Existing settings tabs.
+         * @return array Settings tabs including the Mailster tab.
+         */
+        public function settings_menu( $settings_tabs ) {
 
                 wp_enqueue_style( 'mailster-gravityforms-style', $this->plugin_url . 'assets/style.css', array(), MAILSTER_GRAVITYFORMS_VERSION );
@@ -144 +227 @@
         }
 
+        /**
+         * Saves the posted Mailster settings onto the current Gravity Form.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function save() {
 
                 if ( ! current_user_can( 'manage_options' ) ) {
-                        return; }
-
-                if ( ! isset( $_POST['gform_save_form_settings'] ) || ! wp_verify_nonce( $_POST['gform_save_form_settings'], 'mailster_gf_save_form' ) ) {
-                        return; }
-
-                $form_id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : null;
+                        return;
+                }
+
+                $nonce = isset( $_POST['gform_save_form_settings'] ) ? sanitize_text_field( wp_unslash( $_POST['gform_save_form_settings'] ) ) : '';
+                if ( ! wp_verify_nonce( $nonce, 'mailster_gf_save_form' ) ) {
+                        return;
+                }
+
+                $form_id = isset( $_GET['id'] ) ? absint( wp_unslash( $_GET['id'] ) ) : 0;
                 if ( ! $form_id ) {
-                        return; }
+                        return;
+                }
 
                 $form = RGFormsModel::get_form_meta( $form_id );
-                if ( ! $form ) {
-                        return; }
-
-                $form['mailster'] = $_POST['mailster'];
-                $conditional      = explode( '|', $form['mailster']['conditional_field'] );
+                if ( ! $form || ! isset( $_POST['mailster'] ) || ! is_array( $_POST['mailster'] ) ) {
+                        return;
+                }
+
+                $form['mailster'] = map_deep( wp_unslash( $_POST['mailster'] ), 'sanitize_text_field' );
+
+                if ( isset( $_POST['mailster']['conditional_field'] ) ) {
+                        // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- tags stripped; octets must be preserved for GF choice values.
+                        $raw_conditional = wp_unslash( $_POST['mailster']['conditional_field'] );
+                        if ( is_scalar( $raw_conditional ) ) {
+                                $form['mailster']['conditional_field'] = preg_replace(
+                                        '/[\r\n\t]+/',
+                                        '',
+                                        wp_strip_all_tags( (string) $raw_conditional )
+                                );
+                        }
+                }
+
+                $conditional_field = isset( $form['mailster']['conditional_field'] ) ? $form['mailster']['conditional_field'] : '';
+                $conditional       = explode( '|', $conditional_field );
 
                 if ( count( $conditional ) > 1 ) {
@@ -170 +279 @@
 
                 RGFormsModel::update_form_meta( $form_id, $form );
-
         }
 }

mailster-gravity-forms/tags/2.1.0/mailster-gravity-forms.php

@@ -1 +1 @@
 <?php
-/*
-Plugin Name: Mailster Gravity Forms
-Plugin URI: https://mailster.co/?utm_campaign=wporg&utm_source=wordpress.org&utm_medium=plugin&utm_term=Gravity+Forms
-Version: 2.0.0
-License: GPLv2
-Author: EverPress
-Author URI: https://mailster.co
-Text Domain: mailster-gravityforms
-Description: Integrates Mailster Newsletter Plugin with Gravity Forms to subscribe users with a Gravity Form.
-Requires the Mailster Newsletter Plugin and the Gravity Forms plugin
-*/
+/**
+ * Plugin Name: Mailster Gravity Forms
+ * Plugin URI: https://mailster.co/?utm_campaign=wporg&utm_source=wordpress.org&utm_medium=plugin&utm_term=Gravity+Forms
+ * Version: 2.1.0
+ * License: GPLv2
+ * Author: EverPress
+ * Author URI: https://mailster.co
+ * Text Domain: mailster-gravityforms
+ * Description: Integrates Mailster Newsletter Plugin with Gravity Forms to subscribe users with a Gravity Form.
+ * Requires the Mailster Newsletter Plugin and the Gravity Forms plugin
+ *
+ * @package Mailster_Gravity_Forms
+ */
 
-define( 'MAILSTER_GRAVITYFORMS_VERSION', '2.0.0' );
+define( 'MAILSTER_GRAVITYFORMS_VERSION', '2.1.0' );
 define( 'MAILSTER_GRAVITYFORMS_REQUIRED_VERSION', '4.0' );
 define( 'MAILSTER_GRAVITYFORMS_FILE', __FILE__ );

mailster-gravity-forms/tags/2.1.0/views/page.php

@@ -1 +1 @@
 <?php
+/**
+ * Mailster settings panel for a Gravity Form.
+ *
+ * @package Mailster_Gravity_Forms
+ */
 
 if ( ! function_exists( 'mailster' ) ) {
@@ -8 +13 @@
 }
 
-$form_id  = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : null;
-$form     = RGFormsModel::get_form_meta( $form_id );
-$mailster = isset( $form['mailster'] ) ? $form['mailster'] : array(
+$mailster_form_id = absint( filter_input( INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT ) );
+$mailster_form    = RGFormsModel::get_form_meta( $mailster_form_id );
+$mailster         = isset( $mailster_form['mailster'] ) ? $mailster_form['mailster'] : array(
         'lists'             => array(),
         'map'               => array(),
@@ -39 +44 @@
                                 </p>
                                 <?php
-                                $fields = array(
+                                $mailster_fields = array(
                                         'email'     => mailster_text( 'email' ),
                                         'firstname' => mailster_text( 'firstname' ),
@@ -45 +50 @@
                                 );
 
-                                if ( $customfields = mailster()->get_custom_fields() ) {
-                                        foreach ( $customfields as $field => $data ) {
-                                                $fields[ $field ] = $data['name'];
+                                $mailster_custom_fields = mailster()->get_custom_fields();
+                                if ( $mailster_custom_fields ) {
+                                        foreach ( $mailster_custom_fields as $mailster_field_key => $mailster_field_data ) {
+                                                $mailster_fields[ $mailster_field_key ] = $mailster_field_data['name'];
                                         }
                                 }
-                                $optionsdd = '<option value="-1">' . esc_html__( 'choose', 'mailster-gravityforms' ) . '</option>';
-                                foreach ( $fields as $id => $name ) {
-                                        $optionsdd .= '<option value="' . $id . '">' . $name . '</option>';
-                                }
 
-                                if ( is_array( $form['fields'] ) && ! empty( $form['fields'] ) ) {
+                                if ( is_array( $mailster_form['fields'] ) && ! empty( $mailster_form['fields'] ) ) {
                                         echo '<ul id="mailster-map">';
-                                        foreach ( $form['fields'] as $field ) {
-                                                if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                                                        echo '<li><strong>' . ( ! empty( $field['label'] ) ? $field['label'] : esc_html__( 'Untitled', 'mailster-gravityforms' ) ) . ':</strong><ul>';
+                                        foreach ( $mailster_form['fields'] as $mailster_field ) {
+                                                if ( isset( $mailster_field['inputs'] ) && is_array( $mailster_field['inputs'] ) ) {
+                                                        $mailster_group_label = ! empty( $mailster_field['label'] ) ? $mailster_field['label'] : __( 'Untitled', 'mailster-gravityforms' );
+                                                        echo '<li><strong>' . esc_html( $mailster_group_label ) . ':</strong><ul>';
 
-                                                        foreach ( $field['inputs'] as $input ) {
-                                                                echo '<li><label>' . $input['label'] . '</label> ➨ <select name="mailster[map][' . $input['id'] . ']" >';
+                                                        foreach ( $mailster_field['inputs'] as $mailster_input ) {
+                                                                $mailster_mapped_input = isset( $mailster['map'][ $mailster_input['id'] . '' ] ) ? $mailster['map'][ $mailster_input['id'] . '' ] : '';
+                                                                echo '<li><label>' . esc_html( $mailster_input['label'] ) . '</label> ➨ <select name="mailster[map][' . esc_attr( $mailster_input['id'] ) . ']" >';
                                                                 echo '<option value="-1">' . esc_html__( 'not mapped', 'mailster-gravityforms' ) . '</option>';
-                                                                echo '<optgroup label="' . esc_html__( 'Fields', 'mailster-gravityforms' ) . '">';
-                                                                foreach ( $fields as $id => $name ) {
-                                                                        echo '<option value="' . $id . '" ' . selected( $id, @$mailster['map'][ $input['id'] . '' ], false ) . '>' . $name . '</option>';
+                                                                echo '<optgroup label="' . esc_attr__( 'Fields', 'mailster-gravityforms' ) . '">';
+                                                                foreach ( $mailster_fields as $mailster_field_key => $mailster_field_name ) {
+                                                                        echo '<option value="' . esc_attr( $mailster_field_key ) . '" ' . selected( $mailster_field_key, $mailster_mapped_input, false ) . '>' . esc_html( $mailster_field_name ) . '</option>';
                                                                 }
                                                                 echo '</optgroup>';
-                                                                echo '<optgroup label="' . esc_html__( 'List specific', 'mailster-gravityforms' ) . '">';
-                                                                echo '<option value="_list" ' . selected( '_list', @$mailster['map'][ $input['id'] . '' ], false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
+                                                                echo '<optgroup label="' . esc_attr__( 'List specific', 'mailster-gravityforms' ) . '">';
+                                                                echo '<option value="_list" ' . selected( '_list', $mailster_mapped_input, false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
                                                                 echo '</optgroup>';
                                                                 echo '</select></li>';
@@ -78 +82 @@
 
                                                 } else {
-                                                        echo '<li> <label><strong>' . $field['label'] . '</strong></label> ➨ <select name="mailster[map][' . $field['id'] . ']">';
+                                                        $mailster_mapped_field = isset( $mailster['map'][ $mailster_field['id'] . '' ] ) ? $mailster['map'][ $mailster_field['id'] . '' ] : '';
+                                                        echo '<li> <label><strong>' . esc_html( $mailster_field['label'] ) . '</strong></label> ➨ <select name="mailster[map][' . esc_attr( $mailster_field['id'] ) . ']">';
                                                         echo '<option value="-1">' . esc_html__( 'not mapped', 'mailster-gravityforms' ) . '</option>';
-                                                        echo '<optgroup label="' . esc_html__( 'Fields', 'mailster-gravityforms' ) . '">';
-                                                        foreach ( $fields as $id => $name ) {
-                                                                echo '<option value="' . $id . '" ' . selected( $id, @$mailster['map'][ $field['id'] . '' ], false ) . '>' . $name . '</option>';
+                                                        echo '<optgroup label="' . esc_attr__( 'Fields', 'mailster-gravityforms' ) . '">';
+                                                        foreach ( $mailster_fields as $mailster_field_key => $mailster_field_name ) {
+                                                                echo '<option value="' . esc_attr( $mailster_field_key ) . '" ' . selected( $mailster_field_key, $mailster_mapped_field, false ) . '>' . esc_html( $mailster_field_name ) . '</option>';
                                                         }
                                                         echo '</optgroup>';
-                                                        echo '<optgroup label="' . esc_html__( 'List specific', 'mailster-gravityforms' ) . '">';
-                                                                echo '<option value="_list" ' . selected( '_list', @$mailster['map'][ $field['id'] . '' ], false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
+                                                        echo '<optgroup label="' . esc_attr__( 'List specific', 'mailster-gravityforms' ) . '">';
+                                                                echo '<option value="_list" ' . selected( '_list', $mailster_mapped_field, false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
                                                         echo '</optgroup>';
                                                         echo '</select></li>';
@@ -104 +109 @@
                                 <td>
                                 <?php
-                                $selected = isset( $mailster['lists'] ) ? $mailster['lists'] : array();
-                                mailster( 'lists' )->print_it( null, null, $name = 'mailster[lists]', false, $selected );
+                                $mailster_selected_lists = isset( $mailster['lists'] ) ? $mailster['lists'] : array();
+                                mailster( 'lists' )->print_it( null, null, 'mailster[lists]', false, $mailster_selected_lists );
                                 ?>
                                 </td>
@@ -121 +126 @@
                                 <p><?php esc_html_e( 'subscribe user only if', 'mailster-gravityforms' ); ?>
                                 <?php
-                                if ( is_array( $form['fields'] ) ) {
+                                if ( is_array( $mailster_form['fields'] ) ) {
                                         echo '<select name="mailster[conditional_field]"><option value="-1">-</option>';
-                                        foreach ( $form['fields'] as $field ) {
-                                                if ( ! in_array( $field['type'], array( 'checkbox', 'radio' ) ) ) {
+                                        foreach ( $mailster_form['fields'] as $mailster_field ) {
+                                                if ( ! in_array( $mailster_field['type'], array( 'checkbox', 'radio' ), true ) ) {
                                                         continue;
                                                 }
 
-                                                if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                                                        echo '<optgroup label="' . ( $field['label'] ? $field['label'] : esc_html__( 'Checkbox', 'mailster-gravityforms' ) ) . '">';
-                                                        foreach ( $field['inputs'] as $input ) {
-                                                                echo '<option value="' . $input['id'] . '" ' . selected( $input['id'], $mailster['conditional_field'], false ) . '>' . $input['label'] . '</option>'; }
+                                                if ( isset( $mailster_field['inputs'] ) && is_array( $mailster_field['inputs'] ) ) {
+                                                        $mailster_group_label = $mailster_field['label'] ? $mailster_field['label'] : __( 'Checkbox', 'mailster-gravityforms' );
+                                                        echo '<optgroup label="' . esc_attr( $mailster_group_label ) . '">';
+                                                        foreach ( $mailster_field['inputs'] as $mailster_input ) {
+                                                                echo '<option value="' . esc_attr( $mailster_input['id'] ) . '" ' . selected( $mailster_input['id'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_input['label'] ) . '</option>';
+                                                        }
                                                         echo '</optgroup>';
 
-                                                } elseif ( isset( $field['choices'] ) && is_array( $field['choices'] ) ) {
-                                                        echo '<optgroup label="' . $field['label'] . '">';
-                                                        foreach ( $field['choices'] as $input ) {
-                                                                echo '<option value="' . $field['id'] . '|' . $input['value'] . '" ' . selected( $input['value'], $mailster['conditional_field'], false ) . '>' . $input['text'] . '</option>'; }
+                                                } elseif ( isset( $mailster_field['choices'] ) && is_array( $mailster_field['choices'] ) ) {
+                                                        echo '<optgroup label="' . esc_attr( $mailster_field['label'] ) . '">';
+                                                        foreach ( $mailster_field['choices'] as $mailster_input ) {
+                                                                echo '<option value="' . esc_attr( $mailster_field['id'] . '|' . $mailster_input['value'] ) . '" ' . selected( $mailster_input['value'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_input['text'] ) . '</option>';
+                                                        }
                                                         echo '</optgroup>';
 
                                                 } else {
-                                                        echo '<option value="' . $field['id'] . '" ' . selected( $input['id'], $mailster['conditional_field'], false ) . '>sss' . $field['label'] . '</option>';
+                                                        echo '<option value="' . esc_attr( $mailster_field['id'] ) . '" ' . selected( $mailster_field['id'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_field['label'] ) . '</option>';
                                                 }
                                         }

mailster-gravity-forms/trunk/assets/style.css

@@ -2 +2 @@
         border-bottom: 1px solid #ccc;
 }
+
 #mailster-map li label {
         display: inline-block;
         width: 150px;
 }
+
 #mailster-map li label select {
         display: inline-block;
         width: 200px;
 }
+
 #mailster-map li ul li {
         border-bottom: 0;
         padding-left: 20px;
 }
+
 .gform-icon--mailster {
         background-image: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 949.9 778.9"><path d="M645.9 0L475 209 304 0H0v778.9h266V342l209 284.9L683.9 342v436.9h266V0z"/></svg>');
@@ -21 +25 @@
         width: 26px;
 }
+
+/* Gravity Forms renders this settings tab id. */
+/* stylelint-disable-next-line selector-id-pattern */
 #tab_mailster .gform-settings-panel__content select {
         width: auto;

mailster-gravity-forms/trunk/classes/gravity.class.php

@@ -1 +1 @@
 <?php
-
+/**
+ * Gravity Forms integration for Mailster.
+ *
+ * @package Mailster_Gravity_Forms
+ */
+
+/**
+ * Connects Gravity Forms submissions to Mailster subscribers.
+ *
+ * @since 1.0
+ */
 class MailsterGravitiyForm {
 
+        /**
+         * Absolute filesystem path of this plugin.
+         *
+         * @since 1.0
+         *
+         * @var string
+         */
         private $plugin_path;
+
+        /**
+         * Base URL of this plugin.
+         *
+         * @since 1.0
+         *
+         * @var string
+         */
         private $plugin_url;
 
+        /**
+         * Registers lifecycle hooks and loads the text domain.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function __construct() {
 
@@ -17 +49 @@
 
                 add_action( 'plugins_loaded', array( &$this, 'init' ) );
-
-        }
-
+        }
+
+        /**
+         * Fires when the plugin is activated.
+         *
+         * @since 1.0
+         *
+         * @param bool $network_wide Whether the plugin is being activated network-wide.
+         * @return void
+         */
         public function activate( $network_wide ) {}
 
+        /**
+         * Fires when the plugin is deactivated.
+         *
+         * @since 1.0
+         *
+         * @param bool $network_wide Whether the plugin is being deactivated network-wide.
+         * @return void
+         */
         public function deactivate( $network_wide ) {}
 
+        /**
+         * Registers Gravity Forms hooks for submissions and form settings.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function init() {
 
@@ -30 +84 @@
                 if ( is_admin() ) {
 
-                        add_filter( 'gform_form_settings_menu', array( &$this, 'settings_menu' ), 10, 2 );
+                        add_filter( 'gform_form_settings_menu', array( &$this, 'settings_menu' ) );
                         add_action( 'gform_form_settings_page_mailster', array( &$this, 'settings_page' ) );
 
-                        if ( isset( $_POST['gform_save_settings'] ) ) {
-                                $this->save();
-                        }
-                }
-        }
-
+                        $this->save();
+                }
+        }
+
+        /**
+         * Creates or updates a Mailster subscriber from a Gravity Forms entry.
+         *
+         * Respects the form's list mapping, conditional field, and double opt-in settings.
+         *
+         * @since 1.0
+         *
+         * @param array $entry Submitted Gravity Forms entry.
+         * @param array $form  Gravity Forms form meta, including Mailster settings.
+         * @return void
+         */
         public function after_submission( $entry, $form ) {
 
@@ -62 +125 @@
                         if ( isset( $form['mailster']['conditional_id'] ) ) {
 
-                                if ( isset( $entry[ $form['mailster']['conditional_id'] ] ) && ( $entry[ $form['mailster']['conditional_id'] ] != $form['mailster']['conditional_field'] ) ) {
-                                        return;
-                                }
-                                if ( ! isset( $entry[ $form['mailster']['conditional_id'] ] ) ) {
+                                $conditional_id = $form['mailster']['conditional_id'];
+                                if ( isset( $entry[ $conditional_id ] ) && (string) $entry[ $conditional_id ] !== (string) $form['mailster']['conditional_field'] ) {
+                                        return;
+                                }
+                                if ( ! isset( $entry[ $conditional_id ] ) ) {
                                         return;
                                 }
@@ -85 +149 @@
 
                 foreach ( $form['mailster']['map'] as $field_id => $key ) {
-                        if ( '_list' == $key ) {
+                        if ( '_list' === $key ) {
                                 $listname = $entry[ $field_id ];
                                 if ( empty( $listname ) ) {
@@ -96 +160 @@
                                         $list_ids[] = $list_id;
                                 }
-                        } elseif ( $key != -1 ) {
+                        } elseif ( '-1' !== (string) $key ) {
                                 $userdata[ $key ] = $entry[ $field_id ];
                         }
@@ -105 +169 @@
                 }
 
-                if ( $subscriber = mailster( 'subscribers' )->get_by_mail( $userdata['email'] ) ) {
+                $subscriber = mailster( 'subscribers' )->get_by_mail( $userdata['email'] );
+                if ( $subscriber ) {
+                        $userdata['ID']          = (int) $subscriber->ID;
+                        $userdata['hash']        = $subscriber->hash;
                         $userdata['status']      = $subscriber->status;
-                        $subscriber_notification = $subscriber->status == 0; // send again if not confirmed already,
+                        $subscriber_notification = 0 === (int) $subscriber->status; // send again if not confirmed already.
+
+                        // add() strips the ID on the front end. When the duplicate-key update
+                        // changes nothing, insert_id is 0 and send_confirmations() emails every
+                        // pending subscriber. Updating by ID keeps the resend on this subscriber.
+                        $subscriber_id = mailster( 'subscribers' )->update( $userdata, true, true, $subscriber_notification );
                 } else {
                         $userdata['status']      = isset( $form['mailster']['double-opt-in'] ) ? 0 : 1;
                         $subscriber_notification = true;
-                }
-
-                $overwrite     = true;
-                $merge         = true;
-                $subscriber_id = mailster( 'subscribers' )->add( $userdata, $overwrite, $merge, $subscriber_notification );
+                        $subscriber_id           = mailster( 'subscribers' )->add( $userdata, true, true, $subscriber_notification );
+                }
 
                 if ( ! is_wp_error( $subscriber_id ) ) {
                         mailster( 'subscribers' )->assign_lists( $subscriber_id, $list_ids, false, $userdata['status'] ? true : false );
                 }
-
-        }
-
+        }
+
+        /**
+         * Prints the Mailster panel on the Gravity Forms settings screen.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function settings_page() {
 
@@ -132 +207 @@
         }
 
-        public function settings_menu( $settings_tabs, $form_id ) {
+        /**
+         * Adds the Mailster tab to a form's settings menu.
+         *
+         * @since 1.0
+         *
+         * @param array $settings_tabs Existing settings tabs.
+         * @return array Settings tabs including the Mailster tab.
+         */
+        public function settings_menu( $settings_tabs ) {
 
                 wp_enqueue_style( 'mailster-gravityforms-style', $this->plugin_url . 'assets/style.css', array(), MAILSTER_GRAVITYFORMS_VERSION );
@@ -144 +227 @@
         }
 
+        /**
+         * Saves the posted Mailster settings onto the current Gravity Form.
+         *
+         * @since 1.0
+         *
+         * @return void
+         */
         public function save() {
 
                 if ( ! current_user_can( 'manage_options' ) ) {
-                        return; }
-
-                if ( ! isset( $_POST['gform_save_form_settings'] ) || ! wp_verify_nonce( $_POST['gform_save_form_settings'], 'mailster_gf_save_form' ) ) {
-                        return; }
-
-                $form_id = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : null;
+                        return;
+                }
+
+                $nonce = isset( $_POST['gform_save_form_settings'] ) ? sanitize_text_field( wp_unslash( $_POST['gform_save_form_settings'] ) ) : '';
+                if ( ! wp_verify_nonce( $nonce, 'mailster_gf_save_form' ) ) {
+                        return;
+                }
+
+                $form_id = isset( $_GET['id'] ) ? absint( wp_unslash( $_GET['id'] ) ) : 0;
                 if ( ! $form_id ) {
-                        return; }
+                        return;
+                }
 
                 $form = RGFormsModel::get_form_meta( $form_id );
-                if ( ! $form ) {
-                        return; }
-
-                $form['mailster'] = $_POST['mailster'];
-                $conditional      = explode( '|', $form['mailster']['conditional_field'] );
+                if ( ! $form || ! isset( $_POST['mailster'] ) || ! is_array( $_POST['mailster'] ) ) {
+                        return;
+                }
+
+                $form['mailster'] = map_deep( wp_unslash( $_POST['mailster'] ), 'sanitize_text_field' );
+
+                if ( isset( $_POST['mailster']['conditional_field'] ) ) {
+                        // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- tags stripped; octets must be preserved for GF choice values.
+                        $raw_conditional = wp_unslash( $_POST['mailster']['conditional_field'] );
+                        if ( is_scalar( $raw_conditional ) ) {
+                                $form['mailster']['conditional_field'] = preg_replace(
+                                        '/[\r\n\t]+/',
+                                        '',
+                                        wp_strip_all_tags( (string) $raw_conditional )
+                                );
+                        }
+                }
+
+                $conditional_field = isset( $form['mailster']['conditional_field'] ) ? $form['mailster']['conditional_field'] : '';
+                $conditional       = explode( '|', $conditional_field );
 
                 if ( count( $conditional ) > 1 ) {
@@ -170 +279 @@
 
                 RGFormsModel::update_form_meta( $form_id, $form );
-
         }
 }

mailster-gravity-forms/trunk/mailster-gravity-forms.php

@@ -1 +1 @@
 <?php
-/*
-Plugin Name: Mailster Gravity Forms
-Plugin URI: https://mailster.co/?utm_campaign=wporg&utm_source=wordpress.org&utm_medium=plugin&utm_term=Gravity+Forms
-Version: 2.0.0
-License: GPLv2
-Author: EverPress
-Author URI: https://mailster.co
-Text Domain: mailster-gravityforms
-Description: Integrates Mailster Newsletter Plugin with Gravity Forms to subscribe users with a Gravity Form.
-Requires the Mailster Newsletter Plugin and the Gravity Forms plugin
-*/
+/**
+ * Plugin Name: Mailster Gravity Forms
+ * Plugin URI: https://mailster.co/?utm_campaign=wporg&utm_source=wordpress.org&utm_medium=plugin&utm_term=Gravity+Forms
+ * Version: 2.1.0
+ * License: GPLv2
+ * Author: EverPress
+ * Author URI: https://mailster.co
+ * Text Domain: mailster-gravityforms
+ * Description: Integrates Mailster Newsletter Plugin with Gravity Forms to subscribe users with a Gravity Form.
+ * Requires the Mailster Newsletter Plugin and the Gravity Forms plugin
+ *
+ * @package Mailster_Gravity_Forms
+ */
 
-define( 'MAILSTER_GRAVITYFORMS_VERSION', '2.0.0' );
+define( 'MAILSTER_GRAVITYFORMS_VERSION', '2.1.0' );
 define( 'MAILSTER_GRAVITYFORMS_REQUIRED_VERSION', '4.0' );
 define( 'MAILSTER_GRAVITYFORMS_FILE', __FILE__ );

mailster-gravity-forms/trunk/views/page.php

@@ -1 +1 @@
 <?php
+/**
+ * Mailster settings panel for a Gravity Form.
+ *
+ * @package Mailster_Gravity_Forms
+ */
 
 if ( ! function_exists( 'mailster' ) ) {
@@ -8 +13 @@
 }
 
-$form_id  = isset( $_GET['id'] ) ? intval( $_GET['id'] ) : null;
-$form     = RGFormsModel::get_form_meta( $form_id );
-$mailster = isset( $form['mailster'] ) ? $form['mailster'] : array(
+$mailster_form_id = absint( filter_input( INPUT_GET, 'id', FILTER_SANITIZE_NUMBER_INT ) );
+$mailster_form    = RGFormsModel::get_form_meta( $mailster_form_id );
+$mailster         = isset( $mailster_form['mailster'] ) ? $mailster_form['mailster'] : array(
         'lists'             => array(),
         'map'               => array(),
@@ -39 +44 @@
                                 </p>
                                 <?php
-                                $fields = array(
+                                $mailster_fields = array(
                                         'email'     => mailster_text( 'email' ),
                                         'firstname' => mailster_text( 'firstname' ),
@@ -45 +50 @@
                                 );
 
-                                if ( $customfields = mailster()->get_custom_fields() ) {
-                                        foreach ( $customfields as $field => $data ) {
-                                                $fields[ $field ] = $data['name'];
+                                $mailster_custom_fields = mailster()->get_custom_fields();
+                                if ( $mailster_custom_fields ) {
+                                        foreach ( $mailster_custom_fields as $mailster_field_key => $mailster_field_data ) {
+                                                $mailster_fields[ $mailster_field_key ] = $mailster_field_data['name'];
                                         }
                                 }
-                                $optionsdd = '<option value="-1">' . esc_html__( 'choose', 'mailster-gravityforms' ) . '</option>';
-                                foreach ( $fields as $id => $name ) {
-                                        $optionsdd .= '<option value="' . $id . '">' . $name . '</option>';
-                                }
 
-                                if ( is_array( $form['fields'] ) && ! empty( $form['fields'] ) ) {
+                                if ( is_array( $mailster_form['fields'] ) && ! empty( $mailster_form['fields'] ) ) {
                                         echo '<ul id="mailster-map">';
-                                        foreach ( $form['fields'] as $field ) {
-                                                if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                                                        echo '<li><strong>' . ( ! empty( $field['label'] ) ? $field['label'] : esc_html__( 'Untitled', 'mailster-gravityforms' ) ) . ':</strong><ul>';
+                                        foreach ( $mailster_form['fields'] as $mailster_field ) {
+                                                if ( isset( $mailster_field['inputs'] ) && is_array( $mailster_field['inputs'] ) ) {
+                                                        $mailster_group_label = ! empty( $mailster_field['label'] ) ? $mailster_field['label'] : __( 'Untitled', 'mailster-gravityforms' );
+                                                        echo '<li><strong>' . esc_html( $mailster_group_label ) . ':</strong><ul>';
 
-                                                        foreach ( $field['inputs'] as $input ) {
-                                                                echo '<li><label>' . $input['label'] . '</label> ➨ <select name="mailster[map][' . $input['id'] . ']" >';
+                                                        foreach ( $mailster_field['inputs'] as $mailster_input ) {
+                                                                $mailster_mapped_input = isset( $mailster['map'][ $mailster_input['id'] . '' ] ) ? $mailster['map'][ $mailster_input['id'] . '' ] : '';
+                                                                echo '<li><label>' . esc_html( $mailster_input['label'] ) . '</label> ➨ <select name="mailster[map][' . esc_attr( $mailster_input['id'] ) . ']" >';
                                                                 echo '<option value="-1">' . esc_html__( 'not mapped', 'mailster-gravityforms' ) . '</option>';
-                                                                echo '<optgroup label="' . esc_html__( 'Fields', 'mailster-gravityforms' ) . '">';
-                                                                foreach ( $fields as $id => $name ) {
-                                                                        echo '<option value="' . $id . '" ' . selected( $id, @$mailster['map'][ $input['id'] . '' ], false ) . '>' . $name . '</option>';
+                                                                echo '<optgroup label="' . esc_attr__( 'Fields', 'mailster-gravityforms' ) . '">';
+                                                                foreach ( $mailster_fields as $mailster_field_key => $mailster_field_name ) {
+                                                                        echo '<option value="' . esc_attr( $mailster_field_key ) . '" ' . selected( $mailster_field_key, $mailster_mapped_input, false ) . '>' . esc_html( $mailster_field_name ) . '</option>';
                                                                 }
                                                                 echo '</optgroup>';
-                                                                echo '<optgroup label="' . esc_html__( 'List specific', 'mailster-gravityforms' ) . '">';
-                                                                echo '<option value="_list" ' . selected( '_list', @$mailster['map'][ $input['id'] . '' ], false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
+                                                                echo '<optgroup label="' . esc_attr__( 'List specific', 'mailster-gravityforms' ) . '">';
+                                                                echo '<option value="_list" ' . selected( '_list', $mailster_mapped_input, false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
                                                                 echo '</optgroup>';
                                                                 echo '</select></li>';
@@ -78 +82 @@
 
                                                 } else {
-                                                        echo '<li> <label><strong>' . $field['label'] . '</strong></label> ➨ <select name="mailster[map][' . $field['id'] . ']">';
+                                                        $mailster_mapped_field = isset( $mailster['map'][ $mailster_field['id'] . '' ] ) ? $mailster['map'][ $mailster_field['id'] . '' ] : '';
+                                                        echo '<li> <label><strong>' . esc_html( $mailster_field['label'] ) . '</strong></label> ➨ <select name="mailster[map][' . esc_attr( $mailster_field['id'] ) . ']">';
                                                         echo '<option value="-1">' . esc_html__( 'not mapped', 'mailster-gravityforms' ) . '</option>';
-                                                        echo '<optgroup label="' . esc_html__( 'Fields', 'mailster-gravityforms' ) . '">';
-                                                        foreach ( $fields as $id => $name ) {
-                                                                echo '<option value="' . $id . '" ' . selected( $id, @$mailster['map'][ $field['id'] . '' ], false ) . '>' . $name . '</option>';
+                                                        echo '<optgroup label="' . esc_attr__( 'Fields', 'mailster-gravityforms' ) . '">';
+                                                        foreach ( $mailster_fields as $mailster_field_key => $mailster_field_name ) {
+                                                                echo '<option value="' . esc_attr( $mailster_field_key ) . '" ' . selected( $mailster_field_key, $mailster_mapped_field, false ) . '>' . esc_html( $mailster_field_name ) . '</option>';
                                                         }
                                                         echo '</optgroup>';
-                                                        echo '<optgroup label="' . esc_html__( 'List specific', 'mailster-gravityforms' ) . '">';
-                                                                echo '<option value="_list" ' . selected( '_list', @$mailster['map'][ $field['id'] . '' ], false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
+                                                        echo '<optgroup label="' . esc_attr__( 'List specific', 'mailster-gravityforms' ) . '">';
+                                                                echo '<option value="_list" ' . selected( '_list', $mailster_mapped_field, false ) . '>' . esc_html__( 'Add to List if checked or not empty', 'mailster-gravityforms' ) . '</option>';
                                                         echo '</optgroup>';
                                                         echo '</select></li>';
@@ -104 +109 @@
                                 <td>
                                 <?php
-                                $selected = isset( $mailster['lists'] ) ? $mailster['lists'] : array();
-                                mailster( 'lists' )->print_it( null, null, $name = 'mailster[lists]', false, $selected );
+                                $mailster_selected_lists = isset( $mailster['lists'] ) ? $mailster['lists'] : array();
+                                mailster( 'lists' )->print_it( null, null, 'mailster[lists]', false, $mailster_selected_lists );
                                 ?>
                                 </td>
@@ -121 +126 @@
                                 <p><?php esc_html_e( 'subscribe user only if', 'mailster-gravityforms' ); ?>
                                 <?php
-                                if ( is_array( $form['fields'] ) ) {
+                                if ( is_array( $mailster_form['fields'] ) ) {
                                         echo '<select name="mailster[conditional_field]"><option value="-1">-</option>';
-                                        foreach ( $form['fields'] as $field ) {
-                                                if ( ! in_array( $field['type'], array( 'checkbox', 'radio' ) ) ) {
+                                        foreach ( $mailster_form['fields'] as $mailster_field ) {
+                                                if ( ! in_array( $mailster_field['type'], array( 'checkbox', 'radio' ), true ) ) {
                                                         continue;
                                                 }
 
-                                                if ( isset( $field['inputs'] ) && is_array( $field['inputs'] ) ) {
-                                                        echo '<optgroup label="' . ( $field['label'] ? $field['label'] : esc_html__( 'Checkbox', 'mailster-gravityforms' ) ) . '">';
-                                                        foreach ( $field['inputs'] as $input ) {
-                                                                echo '<option value="' . $input['id'] . '" ' . selected( $input['id'], $mailster['conditional_field'], false ) . '>' . $input['label'] . '</option>'; }
+                                                if ( isset( $mailster_field['inputs'] ) && is_array( $mailster_field['inputs'] ) ) {
+                                                        $mailster_group_label = $mailster_field['label'] ? $mailster_field['label'] : __( 'Checkbox', 'mailster-gravityforms' );
+                                                        echo '<optgroup label="' . esc_attr( $mailster_group_label ) . '">';
+                                                        foreach ( $mailster_field['inputs'] as $mailster_input ) {
+                                                                echo '<option value="' . esc_attr( $mailster_input['id'] ) . '" ' . selected( $mailster_input['id'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_input['label'] ) . '</option>';
+                                                        }
                                                         echo '</optgroup>';
 
-                                                } elseif ( isset( $field['choices'] ) && is_array( $field['choices'] ) ) {
-                                                        echo '<optgroup label="' . $field['label'] . '">';
-                                                        foreach ( $field['choices'] as $input ) {
-                                                                echo '<option value="' . $field['id'] . '|' . $input['value'] . '" ' . selected( $input['value'], $mailster['conditional_field'], false ) . '>' . $input['text'] . '</option>'; }
+                                                } elseif ( isset( $mailster_field['choices'] ) && is_array( $mailster_field['choices'] ) ) {
+                                                        echo '<optgroup label="' . esc_attr( $mailster_field['label'] ) . '">';
+                                                        foreach ( $mailster_field['choices'] as $mailster_input ) {
+                                                                echo '<option value="' . esc_attr( $mailster_field['id'] . '|' . $mailster_input['value'] ) . '" ' . selected( $mailster_input['value'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_input['text'] ) . '</option>';
+                                                        }
                                                         echo '</optgroup>';
 
                                                 } else {
-                                                        echo '<option value="' . $field['id'] . '" ' . selected( $input['id'], $mailster['conditional_field'], false ) . '>sss' . $field['label'] . '</option>';
+                                                        echo '<option value="' . esc_attr( $mailster_field['id'] ) . '" ' . selected( $mailster_field['id'], $mailster['conditional_field'], false ) . '>' . esc_html( $mailster_field['label'] ) . '</option>';
                                                 }
                                         }