Changeset 3065401

Timestamp:

04/05/2024 11:27:07 AM (23 months ago)

Author:

pinpointe

Message:

plugin update to v1.6

Location:

pinpointe-form-integration/trunk

Files:

• assets/css/style-admin.css (modified) (1 diff)
• assets/js/pinpointe-admin.js (modified) (8 diffs)
• includes/pinpointe-form.inc.php (modified) (2 diffs)
• includes/pinpointe-plugin-structure.inc.php (modified) (32 diffs)
• includes/pinpointe-prepare-form.inc.php (modified) (3 diffs)
• includes/pinpointe-service.class.php (modified) (9 diffs)
• includes/pinpointe-widget.class.php (modified) (4 diffs)
• pinpointe-signup-form.php (modified) (59 diffs)
• readme.txt (modified) (2 diffs)

pinpointe-form-integration/trunk/assets/css/style-admin.css

@@ -70 +70 @@
     width: 70px;
     min-width: 70px;
+}
+
+.pinpointe_forms_confirmation_email_tr td{
+    padding-left: 0px;
 }
 

pinpointe-form-integration/trunk/assets/js/pinpointe-admin.js

@@ -10 +10 @@
      */
     jQuery('form').each(function(){
+        //show/hide confirmation_email depending on overide_confirmation value
+        jQuery(this).find('.pinpointe_forms_send_confirmation').each(function(){
+            pinpointe_hide_confirmation_email_trs(this);
+            pinpointe_hide_confirmation_email_tr(jQuery(this).parent().parent().parent().find('.pinpointe_forms_overide_confirmation'));
+        });
+        jQuery(this).find('.pinpointe_forms_overide_confirmation').each(function(){
+            pinpointe_hide_confirmation_email_tr(this);
+        });
+        //add hints
         jQuery(this).find(':input').each(function(){
             if (typeof pinpointe_hints !== 'undefined' && typeof pinpointe_hints[jQuery(this).prop('id')] !== 'undefined') {
@@ -38 +47 @@
     });
     jQuery('.pinpointe_tip').tooltip();
+
+    /**
+     * show/hide confirmation_email depending on overide_confirmation value
+     */
+    function pinpointe_hide_confirmation_email_tr(overide_obj) {
+        var confirmation_email = jQuery(overide_obj).parent().parent().parent().find('.pinpointe_forms_confirmation_email_tr');
+        if (jQuery(overide_obj).is(':checked')) {
+            confirmation_email.show();
+        } else {
+            confirmation_email.hide();
+        }
+    }
+
+    jQuery('.pinpointe_forms_overide_confirmation').click(function() {
+        pinpointe_hide_confirmation_email_tr(this);
+    });
+
+    function pinpointe_hide_confirmation_email_trs(send_confirmation_obj) {
+        var confirmation_overide = jQuery(send_confirmation_obj).parent().parent().parent().find('.pinpointe_forms_confirmation_email_trs');
+        if (jQuery(send_confirmation_obj).is(':checked')) {
+            confirmation_overide.show();
+        } else {
+            confirmation_overide.hide();
+        }
+    }
+
+    jQuery('.pinpointe_forms_send_confirmation').click(function() {
+        if (!jQuery(this).is(':checked')) {
+            jQuery(this).parent().parent().next().find('.pinpointe_forms_overide_confirmation').prop("checked", false);
+        }
+        pinpointe_hide_confirmation_email_trs(this);
+        pinpointe_hide_confirmation_email_tr(jQuery(this).parent().parent().parent().find('.pinpointe_forms_overide_confirmation'));
+    });
 
     /**
@@ -120 +162 @@
     });
 
+    function activateWPEditors(id) {
+        wp.editor.initialize(id, {
+            tinymce: {
+                height: 500,
+                toolbar1:
+                    "bold italic underline strikethrough | bullist numlist | blockquote hr | alignleft aligncenter alignright | link unlink",
+            },
+            quicktags: true,
+            mediaButtons: false,
+        });
+    }
+
     /**
      * Set up accordion (form management)
      */
     jQuery('#pinpointe_forms_list').accordion({
-        header: '> div > h4',
-        heightStyle: 'content',
-        create: function(event, ui) { FormEditorChanged(); } // SDL
+        header: "> div > h4",
+        heightStyle: "content",
+        create: function (event, ui) {
+            FormEditorChanged();
+        }, // SDL
+        activate: function (event, ui) {
+            var oldEditor = jQuery(ui.oldPanel).find("textarea.pinpointe-field.pinpointe_forms_html_confirmation_email").attr("id");
+            
+            if (tinyMCE.get(oldEditor) !== null || tinyMCE.get(oldEditor) !== undefined) {
+                wp.editor.remove(oldEditor);
+            }
+            
+            var newEditor = jQuery(ui.newPanel).find("textarea.pinpointe-field.pinpointe_forms_html_confirmation_email").attr("id");
+            
+            if (tinyMCE.get(newEditor)) {
+                return;
+            } else {
+                activateWPEditors(newEditor);
+            }
+            // activate chosen on all mailing lists when we click on a form
+            jQuery('.pinpointe-field.pinpointe_forms_mailing_tag').each(function () {
+                jQuery(this).chosen({
+                    no_results_text: pinpointe_label_no_results_match_tag,
+                    width: '366px'
+                });
+            });
+        },
     }).sortable({
-        handle: 'h4',
-        stop: function(event, ui) {
-            regenerate_accordion_handle_titles();
-        }
-    });
-
+            handle: "h4",
+            stop: function (event, ui) {
+                regenerate_accordion_handle_titles();
+            },
+        });
+    
+    function activate_editors() {
+        jQuery(
+            "textarea.pinpointe-field.pinpointe_forms_html_confirmation_email",
+        ).each(function (index, editor) {
+            activateWPEditors(editor.id); 
+        });
+    }
+
+    activate_editors();
     /**
      * Make pages, posts and post_categories fields chosen on form setup 
@@ -182 +269 @@
     });
 
+    var selected_options = [];
     /**
      * Forms page - lists and groups 
@@ -214 +302 @@
 
                     jQuery('.pinpointe_forms_field_tag_groups').each(function() {
-
+                       //we are increment here cause on new forms i.e, how new forms are added by PHP (saved forms)
                         current_field_id++;
-
-                        var current_selected_tag = (typeof pinpointe_selected_tags[current_field_id] !== 'undefined' && typeof pinpointe_selected_tags[current_field_id]['tag'] !== 'undefined' ? pinpointe_selected_tags[current_field_id]['tag'] : null);
+                        
+                        var current_mailing_list_id = 1;
+
+                        let selectedTags = (typeof pinpointe_selected_tags[current_field_id] !== "undefined" &&
+                            typeof pinpointe_selected_tags[current_field_id].tags !== "undefined")
+                            ? pinpointe_selected_tags[current_field_id].tags
+                            : null;
 
                         // List selection
                         if (typeof result['message']['tags'] === 'object') {
-                            // var fields = '';
-                            var fields = '<option value="">&nbsp;</option>'; // SDL
-                            for (var prop in result['message']['tags']) {
-                                fields += '<option value="' + prop + '" ' + (current_selected_tag !== null && current_selected_tag === prop ? 'selected="selected"' : '') + '>' + result['message']['tags'][prop] + '</option>';
+
+                            var pinpointe_label_mailing_list_name = 'Mailing List Name';
+                            var pinpointe_label_selected_list = 'Selected List';
+                            var pinpointe_label_add_new_mailing_list = 'Add Mailing List';
+
+                            var mailing_list_html = '<table id="pinpointe_mailing_list_table_' + current_field_id + '" class="pinpointe_fields_table" style="width: 98%; text-align: left;"><thead><tr><th>' + pinpointe_label_mailing_list_name + '</th><th>' + pinpointe_label_selected_list + '</th><th></th></tr></thead><tbody>';
+
+                            if (selectedTags && Array.isArray(selectedTags)) {
+                                for (var i = 1; i <= selectedTags.length; i++) {
+                                    let currentSelectedTag = selectedTags[i - 1];
+                                    selected_options.push(currentSelectedTag);
+
+                                    let fields = '<option value="">&nbsp;</option>'; // SDL
+
+                                    for (var prop in result['message']['tags']) {
+                                        var tag = result['message']['tags'][prop];
+                                        var isSelected = currentSelectedTag === prop ? 'selected="selected"' : '';
+                                        fields += '<option value="' + prop + '" ' + isSelected + ' data-tag-description="' + tag.description + '">' + tag.name;
+                                        fields += '</option>';
+                                    }
+
+                                    var fieldField = '<select data-placeholder="' + pinpointe_label_select_mailing_tag + '" id="pinpointe_forms_tag_field_' + current_field_id + '_' + i + '" name="pinpointe_options[forms][' + current_field_id + '][tag_field][]" class="pinpointe-field pinpointe_forms_mailing_tag" data-current-mail-list="' + current_field_id + '_' + i + '">' + fields + '</select>';
+
+                                    mailing_list_html += '<tr class="pinpointe_fields_table" id="pinpointe_mailing_list_' + current_field_id + '_' + i + '"><td>' + fieldField + '</td><td style="font-size: 12px !important; word-wrap: break-word;"><p id="selected_name_' + current_field_id + '_' + i + '"></p><p style="margin-top: -6px; font-size: 10px; color: #7d7e80" id="selected_description_' + current_field_id + '_' + i + '"></p></td><td><button type="button" class="pinpointe_remove_mailing_list" data-row-id="'+ current_field_id +'_'+ i +'"><i class="fa fa-times"></i></button></td></tr>';
+
+                                    // Wrap the loop in a fn to create scope for `i` and for the setTimeout is because we are dynamiccally adding html
+                                    (function (i, currentElementId) {
+                                        
+                                        setTimeout(function () {
+                                            var current_id = currentElementId.replace("pinpointe_forms_tag_", "");
+                                         
+                                            var select = jQuery('#pinpointe_forms_tag_field_' + current_id + '_' + i);
+                                            
+                                            jQuery('#selected_name_' + current_id + '_' + i).text(select.find('option:selected').text());
+                                            jQuery('#selected_description_' + current_id + '_' + i).text(select.find('option:selected').data('tag-description'));
+                                        }, 200);
+                                    })(i, jQuery(this).prop("id"));
+
+                                }
+                            } else {
+                                
+                                var fields = '<option value="">&nbsp;</option>'; // SDL
+                                    
+                                for (var prop in result['message']['tags']) {
+                                    var tag = result['message']['tags'][prop];
+                                    fields += '<option value="' + prop + '" data-tag-description="' + tag.description  +'">' + tag.name;
+                                    fields += '</option>';
+                                }
+
+                                var field_field = '<select data-placeholder="' + pinpointe_label_select_mailing_tag + '" id="pinpointe_forms_tag_field_' + current_field_id + '_' + current_mailing_list_id + '" name="pinpointe_options[forms][' + current_field_id + '][tag_field][]" class="pinpointe-field pinpointe_forms_mailing_tag" data-current-mail-list="' + current_field_id + '_' + current_mailing_list_id +'">' + fields + '</select>';
+                            
+                                mailing_list_html += '<tr class="pinpointe_fields_table" id="pinpointe_mailing_list_' + current_field_id + '_' + current_mailing_list_id + '"><td>' + field_field + '</td><td style="font-size: 12px !important; word-wrap: break-word;"><p id="selected_name_' + current_field_id + '_' + current_mailing_list_id + '"></p><p style="margin-top: -6px; font-size: 10px; color: #7d7e80" id="selected_description_' + current_field_id + '_' + current_mailing_list_id + '"></p></td><td><button type="button" class="pinpointe_remove_mailing_list"><i class="fa fa-times"></i></button></td></tr>';
                             }
 
-                            var field_field = '<select id="pinpointe_forms_tag_field_' + current_field_id + '" name="pinpointe_options[forms][' + current_field_id + '][tag_field]" class="pinpointe-field pinpointe_forms_mailing_tag">' + fields + '</select>';
-                            var field_html = '<table class="form-table" style="margin-bottom: 0px;"><tbody><tr valign="top"><th scope="row">' + pinpointe_label_mailing_tag + '</th><td>' + field_field + '</td></tr></tbody></table>';
-
-                            jQuery(this).replaceWith(field_html);
-
-                            // Make it chosen!
-                            jQuery('#pinpointe_forms_tag_field_' + current_field_id).chosen({
-                                no_results_text: pinpointe_label_no_results_match_tag,
-                                placeholder_text_single: pinpointe_label_select_mailing_tag,
-                                width: '400px'
+                            // End table
+                            mailing_list_html += '</tbody><tfoot><tr><td><button type="button" name="pinpointe_add_mailing_list" id="pinpointe_add_mailing_list" class="button button-primary" data-row-id="' + current_field_id + '_' + current_mailing_list_id  +'" value="' + pinpointe_label_add_new_mailing_list + '"><i class="fa fa-plus">&nbsp;&nbsp;' + pinpointe_label_add_new_mailing_list + '</i></button></td><td></td><td></td><td></td></tr></tfoot></table></div>';
+
+                            jQuery(this).replaceWith(mailing_list_html);
+
+                            // Make all select fields chosen
+                            jQuery('.pinpointe-field.pinpointe_forms_mailing_tag').each(function () {
+                                var selectElement = jQuery(this);
+
+                                selectElement.chosen({
+                                    no_results_text: pinpointe_label_no_results_match_tag,
+                                    width: '366px'
+                                }).change(function (evt, params) {
+                                    // Find corresponding <p> tags based on the data-current-mail-list attribute
+                                    var currentMailList = selectElement.data('current-mail-list');
+                                    jQuery('#selected_name_' + currentMailList).text(selectElement.find('option:selected').text());
+                                    jQuery('#selected_description_' + currentMailList).text(selectElement.find('option:selected').data('tag-description'));
+                                });
                             });
-
-                         }
-
+                        }
                          pinpointe_forms_page_hints();
 
@@ -347 +494 @@
         });
     }
+    /**
+     * Disable the selcted options in all selects in a form
+     * 
+     */
+    function hide_selected_options() {
+        jQuery('.pinpointe-field.pinpointe_forms_mailing_tag').each(function (index) {
+            var prevSelect = jQuery(this);
+
+            for (var i = 0; i < selected_options.length; i++) {
+                var optionValue = selected_options[i];
+                var optionToDisable = prevSelect.find('option[value="' + optionValue + '"]');
+
+                if (optionToDisable.length) {
+                    optionToDisable.hide();
+                }
+            }
+        });
+    }
+
+    /**
+     * Enable option for the deleted select
+     */
+    function show_deleted_option(selected_value) {
+        jQuery('.pinpointe-field.pinpointe_forms_mailing_tag').each(function (index) {
+            var optionToEnable = jQuery(this).find('option[value="' + selected_value + '"]');
+
+            if (optionToEnable.length) {
+                optionToEnable.show();
+
+                const indexToRemove = selected_options.indexOf(selected_value);
+
+                // Remove the element at the specified index
+                selected_options.splice(indexToRemove, 1);
+            } 
+        });
+    }
+
+    jQuery(document).on('click', '#pinpointe_add_mailing_list', function () {
+
+        // Get the current mailing list table
+        var mailingListTable = jQuery(this).parent().parent().parent().parent();
+
+        var current_id = parseInt(mailingListTable.attr('id').split('_').pop(), 10);
+        
+        // Get the last row ID
+        var last_mailing_list = parseInt(mailingListTable.find('tbody>tr:last').attr('id').split('_').pop(), 10);
+
+        var last_select = jQuery('#pinpointe_forms_tag_field_' + current_id + '_' + last_mailing_list);
+    
+        var last_selected_value = last_select.find('option:selected').val();
+        if (last_selected_value === '') {
+            return;
+        }
+        if (!selected_options.includes(last_selected_value)) {
+            selected_options.push(last_selected_value);
+        }
+
+        hide_selected_options('#pinpointe_forms_tag_field_' + current_id + '_' + last_mailing_list);
+
+        last_select.chosen('destroy');
+
+        var next_id = last_mailing_list + 1;
+
+        // Clone the last row and insert after the last one
+        var newRow = mailingListTable.find('tbody>tr:last').clone(true);
+        newRow.attr('id', 'pinpointe_mailing_list_' + current_id + '_' + next_id);
+
+        // Update IDs and clear values as needed
+        newRow.find('select').val('');
+        newRow.find('select').attr('id', 'pinpointe_forms_tag_field_' + current_id + '_' + next_id)
+        newRow.find('select').attr('data-current-mail-list', current_id + '_' + next_id);
+
+        newRow.find('#selected_name_' + current_id + '_' +  last_mailing_list).attr('id', 'selected_name_' + current_id + '_' + next_id);
+        newRow.find('#selected_description_' + current_id + '_' +  last_mailing_list).attr('id', 'selected_description_' + current_id + '_' + next_id);
+
+        newRow.find('.pinpointe_remove_mailing_list').attr('data-row-id', + current_id + '_' + next_id);
+
+        // Re-activate Chosen on the cloned select element
+        newRow.find('#pinpointe_forms_tag_field_' + current_id + '_' + next_id).chosen({
+            no_results_text: pinpointe_label_no_results_match_tags,
+            placeholder_text_single: pinpointe_label_select_tag,
+            width: '366px'
+        }).change(function () {
+            var selectElement = jQuery('#pinpointe_forms_tag_field_' + current_id + '_' + next_id);
+
+            jQuery('#selected_name_' + current_id + '_' + next_id).text(selectElement.find('option:selected').text());
+            jQuery('#selected_description_' + current_id + '_' + next_id).text(selectElement.find('option:selected').data('tag-description'));
+        });
+        // Add the new row to the table
+        mailingListTable.find('tbody').append(newRow);
+
+        jQuery('#selected_name_' + current_id + '_' + next_id).text('');
+        jQuery('#selected_description_' + current_id + '_' + next_id).text('');
+
+        last_select.chosen();
+
+    });
+
+    // Listen for the click event on the remove mailing list button
+    jQuery(document).on('click', '.pinpointe_remove_mailing_list', function () {
+        var selectElement = jQuery(this).parent().parent().find('.pinpointe-field.pinpointe_forms_mailing_tag')[0];
+        
+        // check if its the last element.
+        if (jQuery(this).parent().parent().parent().children().length === 1) {
+            jQuery(this).parent().parent().find('.pinpointe-field.pinpointe_forms_mailing_tag').each(function() {
+                var row_id = jQuery(this).prop("id").replace("pinpointe_forms_tag_field_", "");
+                
+                jQuery(this).val('');
+                jQuery(this).trigger('chosen:updated');
+                jQuery('#selected_name_' + row_id).text('');
+                jQuery('#selected_description_' + row_id).text('');
+                
+                show_deleted_option(jQuery(this).find('option:selected').val());
+            });
+        }
+        else {
+            jQuery(this).parent().parent().remove();
+        }
+        
+        show_deleted_option(jQuery(selectElement).find('option:selected').val());
+
+    });
+
+    
 
     /**
@@ -818 +1089 @@
             jQuery('#pinpointe_forms_redirect_url_' + next_id).val('');
 
+             //Change id and name of the following fields and clear their values, except for confirmation email which we will delete
+
+            // 1.Send confirmation email
+            jQuery(this).find('#pinpointe_forms_send_confirmation_' + current_id).attr('id', 'pinpointe_forms_send_confirmation_' + next_id);
+            jQuery('#pinpointe_forms_send_confirmation_' + next_id).attr('name', 'pinpointe_options[forms][' + next_id + '][send_confirmation]');
+            jQuery('#pinpointe_forms_send_confirmation_' + next_id).prop("checked", false);
+
+
+            // 2.Override default confirmation email
+            jQuery(this).find('#pinpointe_forms_overide_confirmation_' + current_id).attr('id', 'pinpointe_forms_overide_confirmation_' + next_id);
+            jQuery('#pinpointe_forms_overide_confirmation_' + next_id).attr('name', 'pinpointe_options[forms][' + next_id + '][overide_confirmation]');
+            jQuery('#pinpointe_forms_overide_confirmation_' + next_id).prop("checked", false);
+
+            pinpointe_hide_confirmation_email_trs(jQuery('#pinpointe_forms_send_confirmation_' + next_id));
+            pinpointe_hide_confirmation_email_tr(jQuery('#pinpointe_forms_overide_confirmation_' + next_id));
+           
+            // 3.Confirmation email
+
+            //rename the td housing the email so that we can locate it
+            jQuery(this).find('#forms_confirmation_email_td_' + current_id).attr('id', 'forms_confirmation_email_td_' + next_id);
+            
+            //take the content from the last form
+            var content = jQuery('#pinpointe_forms_html_confirmation_email_' + current_id).val();
+            
+            //remove the full email well the cloned one...
+            jQuery(this).find('#wp-pinpointe_forms_html_confirmation_email_' + current_id + '-wrap').remove();
+
+            // Create a new textarea element
+            var newTextarea = jQuery('<textarea>');
+
+            newTextarea.addClass('pinpointe-field pinpointe_forms_html_confirmation_email');
+            newTextarea.attr('name', 'pinpointe_options[forms][' + next_id + '][html_confirmation_email]');
+            newTextarea.attr('id', 'pinpointe_forms_html_confirmation_email_' + next_id);
+            newTextarea.attr('rows', '25');
+            newTextarea.attr("style", "width:100%");
+            newTextarea.text(content);
+
+            // Append the new textarea element to the specified td element
+            jQuery('#forms_confirmation_email_td_'+ next_id).append(newTextarea);
+
+            activate_editors();
+
+            //reset the selected options with the selected tags from the new form
+            selected_options = [];
+           
+            let selectedTagsForNewForm = (typeof pinpointe_selected_tags[next_id] !== "undefined" &&
+                typeof pinpointe_selected_tags[next_id].tags !== "undefined")
+                ? pinpointe_selected_tags[next_id].tags
+                : null;
+            
+            //preselect the save opts fro this 'new' form
+            if (selectedTagsForNewForm && Array.isArray(selectedTagsForNewForm)) {
+                for (let i = 0; i < selectedTagsForNewForm.length; i++) {
+                    let currentSelectedTag = selectedTagsForNewForm[i - 1];
+                    selected_options.push(currentSelectedTag);
+                }
+            }
+           
             // Change ids and names of mailing list and groups fields
+            //id="pinpointe_mailing_list_table_' + current_id + '_' + current_mailing_list_id + '"
+            jQuery(this).find('#pinpointe_mailing_list_table_' + current_id).attr('id', 'pinpointe_mailing_list_table_' + next_id);
+            jQuery('#pinpointe_mailing_list_table_' + next_id + ' tbody tr:not(:first-child)').remove();
+            
+            //pinpointe_forms_tag_field_1_1_chosen
+            jQuery(this).find('.chosen-single span').text("");
+
+            var trElement = jQuery(this).find('#pinpointe_mailing_list_table_' + next_id + ' tbody tr:first-child');
+            trElement.attr('id', 'pinpointe_mailing_list_' + next_id + '_1');
+
+            var selectElement = trElement.find('td select.pinpointe_forms_mailing_tag');
+
+            // Destroy the chosen instance before making changes (this must happen this way)
+            selectElement.chosen('destroy');
+
+            // hide the select and force select the empty opt so that chosen can take over
+            selectElement.find('option:selected').prop('selected', false);
+            selectElement.css('display', 'none');
+            selectElement.find('option[value=""]').attr('selected', true);
+
+            // force clear the prevous opt from the old form
+            trElement.find('td div#pinpointe_forms_tag_field_'+ current_id +'_1_chosen.chosen-container.chosen-container-single a.chosen-single span').text('');
+
+            // update attrs
+            selectElement.val('');
+            selectElement.attr('id', 'pinpointe_forms_tag_field_' + next_id + '_1');
+            selectElement.attr('name', 'pinpointe_options[forms][' + next_id + '][tag_field][]');
+            selectElement.attr('data-current-mail-list', next_id + '_1');
+
+            // Reinitialize chosen after updating attributes
+            selectElement.chosen({
+                no_results_text: pinpointe_label_no_results_match_tag,
+                width: '366px'
+            }).change(function (evt, params) {
+                var selectElement = jQuery('#pinpointe_forms_tag_field_' + next_id + '_1');
+
+                jQuery('#selected_name_' + next_id + '_1').text(selectElement.find('option:selected').text());
+                jQuery('#selected_description_' + next_id + '_1').text(selectElement.find('option:selected').data('tag-description'));
+            });
+
+            // Now, we can find the p elements inside the first tr and update their attributes
+            var nameParagraph = trElement.find('p[id^="selected_name_"]');
+            var descriptionParagraph = trElement.find('p[id^="selected_description_"]');
+
+            // Update attributes for name paragraph & clear the text so that we can start afresh again
+            nameParagraph.attr('id', 'selected_name_' + next_id + '_1');
+            descriptionParagraph.attr('id', 'selected_description_' + next_id + '_1');
+
+            nameParagraph.text('');
+            descriptionParagraph.text('');
+
+            // Update the data-row-id attribute for the button in the last td
+            var removeButton = trElement.find('td button.pinpointe_remove_mailing_list');
+            removeButton.attr('data-row-id', next_id + '_1');
+
             jQuery(this).find('#pinpointe_forms_list_field_' + current_id).attr('id', 'pinpointe_forms_list_field_' + next_id);
             jQuery('#pinpointe_forms_list_field_' + next_id).attr('name', 'pinpointe_options[forms][' + next_id + '][list_field]');
@@ -1096 +1480 @@
         if(jQuery(this).find('option[value="email"]:selected').length != 1) {
             enabled = false;
+        }  else {
+            enabled = true;
         }
 

pinpointe-form-integration/trunk/includes/pinpointe-form.inc.php

@@ -8 +8 @@
     function pinpointe_form($allowed_forms = array())
     {
-        $opt = get_option('pinpointe_options', $results);
+        $opt = get_option('pinpointe_options', $results = false);
 
         // Check if integration is enabled
@@ -26 +26 @@
         $html = pinpointe_prepare_form($form, $opt, 'shortcode');
 
-        echo $html;
+        echo esc_html($html);
     }
 }

pinpointe-form-integration/trunk/includes/pinpointe-plugin-structure.inc.php

@@ -31 +31 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>Enter the URL to the Pinpointe XML API that was provided to you.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Enter the URL to the Pinpointe XML API that was provided to you.</p>', 'pinpointe'),
                                     ),
 
@@ -42 +42 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>Enter your Pinpointe username.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Enter your Pinpointe username.</p>', 'pinpointe'),
                                     ),
 
@@ -53 +53 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>API key is required for this plugin to communicate with the Pinpointe servers.</p> <p>To get an API key, send an email to <a href=\'mailto:[email protected]\'>[email protected]</a>.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>API key is required for this plugin to communicate with the Pinpointe servers.</p> <p>To get an API key, send an email to <a href=\'mailto:[email protected]\'>[email protected]</a>.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -68 +68 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Controls whether a double opt-in confirmation message is sent before user is actually subscribed.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Controls whether a double opt-in confirmation message is sent before user is actually subscribed.</p>', 'pinpointe'),
                                     ),
                                     'send_welcome' => array(
@@ -78 +78 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>If double opt-in is disabled and this setting is enabled, MailChimp will send your lists Welcome Email on user subscription. This has no effect if double opt-in is enabled.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If double opt-in is disabled and this setting is enabled, MailChimp will send your lists Welcome Email on user subscription. This has no effect if double opt-in is enabled.</p>', 'pinpointe'),
                                     ),
                                     'replace_groups' => array(
@@ -88 +88 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Setting is used by MailChimp to determine whether interest groups are added to a set of existing interest groups of particular user or they are completely replaced with new interest groups. This is applicable when user is already subscribed to the list and profile is being updated.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Setting is used by MailChimp to determine whether interest groups are added to a set of existing interest groups of particular user or they are completely replaced with new interest groups. This is applicable when user is already subscribed to the list and profile is being updated.</p>', 'pinpointe'),
                                     ),*/
                                     'add_to_autoresponders' => array(
@@ -98 +98 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Control whether newly subscribed members will be added to autoresponders.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Control whether newly subscribed members will be added to autoresponders.</p>', 'pinpointe'),
                                     ),
                                     'update_existing' => array(
@@ -108 +108 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Control whether existing subscribers are updated when they fill out the signup form again or error is displayed. This has no effect for Sync functionality.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Control whether existing subscribers are updated when they fill out the signup form again or error is displayed. This has no effect for Sync functionality.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -123 +123 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Controls whether signup form field labels are displayed inside fields as value placeholders (inline) or above fields.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Controls whether signup form field labels are displayed inside fields as value placeholders (inline) or above fields.</p>', 'pinpointe'),
                                     ),
                                     /*'groups_hidden' => array(
@@ -133 +133 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Interest groups can take significant amount of space. If this option is enabled, interest group fields will be hidden until user starts filling in the form (clicks anywhere on the form).</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Interest groups can take significant amount of space. If this option is enabled, interest group fields will be hidden until user starts filling in the form (clicks anywhere on the form).</p>', 'pinpointe'),
                                     ),*/
                                     'width_limit' => array(
@@ -143 +143 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>If your website features a wide layout, you may wish to set the max width for the form to look better. This has no effect for forms displayed as popup.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If your website features a wide layout, you may wish to set the max width for the form to look better. This has no effect for forms displayed as popup.</p>', 'pinpointe'),
                                     ),
                                     'css_override' => array(
@@ -153 +153 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>You can further customize the appearance of your signup forms by adding custom CSS to this field. To make changes to the style, simply use CSS class pinpointe_custom_css as a basis.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>You can further customize the appearance of your signup forms by adding custom CSS to this field. To make changes to the style, simply use CSS class pinpointe_custom_css as a basis.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -185 +185 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>Displays popup with mailing database signup form as configured. You can use form conditions for more granual control.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Displays popup with mailing database signup form as configured. You can use form conditions for more granual control.</p>', 'pinpointe'),
                                     ),
                                     'popup_form' => array(
@@ -196 +196 @@
                                         ),
                                         'values' => PinpointeSignupForm::get_list_of_forms(),
-                                        'hint' => __('<p>Select one of the forms created under tab Forms to display as a popup.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select one of the forms created under tab Forms to display as a popup.</p>', 'pinpointe'),
                                     ),
                                     'popup_delay' => array(
@@ -206 +206 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>If set, form will be opened after a specified number of seconds counting from the complete page load.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If set, form will be opened after a specified number of seconds counting from the complete page load.</p>', 'pinpointe'),
                                     ),
                                     'popup_display_on' => array(
@@ -222 +222 @@
                                             '4' => __('Everywhere else', 'pinpointe'),
                                         ),
-                                        'hint' => __('<p>Page types where you want the popup to be fired.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Page types where you want the popup to be fired.</p>',
+                                            'pinpointe'),
                                     ),
                                 ),
@@ -237 +238 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>Popup will be displayed once in every X pages opened. Leaving blank or setting value to 1 will have the same effect.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Popup will be displayed once in every X pages opened. Leaving blank or setting value to 1 will have the same effect.</p>', 'pinpointe'),
                                     ),
                                     'popup_time_limit' => array(
@@ -247 +248 @@
                                             'empty' => true,
                                         ),
-                                        'hint' => __('<p>Popup will be displayed once in every X minutes.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Popup will be displayed once in every X minutes.</p>',
+                                            'pinpointe'),
                                     ),
                                     'popup_allow_dismissing' => array(
@@ -257 +259 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>If enabled, users will be provided with an option (a link to click) to hide the popup forever without filling in the form.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If enabled, users will be provided with an option (a link to click) to hide the popup forever without filling in the form.</p>', 'pinpointe'),
                                     ),
                                     'label_dismiss_popup' => array(
@@ -267 +269 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>If popup dismissing is enabled, this will be the text of the dismiss link.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If popup dismissing is enabled, this will be the text of the dismiss link.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -292 +294 @@
                                             '2' => __('Pages', 'pinpointe'),
                                         ),
-                                        'hint' => __('<p>Page types where you want the form to be displayed below the main content. You can use form conditions for more granular control.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Page types where you want the form to be displayed below the main content. You can use form conditions for more granular control.</p>', 'pinpointe'),
                                     ),
                                     'after_posts_allowed_forms' => array(
@@ -303 +305 @@
                                         ),
                                         'values' => PinpointeSignupForm::get_list_of_forms(false),
-                                        'hint' => __('<p>If a list of form IDs is specified, only those forms will be eligible to be displayed. The forms will be filtered based on their display conditions, then the first remaining form will be displayed.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If a list of form IDs is specified, only those forms will be eligible to be displayed. The forms will be filtered based on their display conditions, then the first remaining form will be displayed.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -324 +326 @@
                                             'empty' => false
                                         ),
-                                        'hint' => __('<p>If enabled, posts or pages that match form display conditions will be locked. Only subscribers will be able to access that content. This functionality uses cookies for tracking. If subscriber clears browser cookies, content will be locked again.</p> <p>Use form conditions to control which pages will be locked.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>If enabled, posts or pages that match form display conditions will be locked. Only subscribers will be able to access that content. This functionality uses cookies for tracking. If subscriber clears browser cookies, content will be locked again.</p> <p>Use form conditions to control which pages will be locked.</p>', 'pinpointe'),
                                     ),
                                     'lock_form' => array(
@@ -335 +337 @@
                                         ),
                                         'values' => PinpointeSignupForm::get_list_of_forms(),
-                                        'hint' => __('<p>Select one of the forms created under tab Forms to display instead of locked content.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select one of the forms created under tab Forms to display instead of locked content.</p>', 'pinpointe'),
                                     ),
                                     'lock_title' => array(
@@ -345 +347 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>Title to display above signup form.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Title to display above signup form.</p>', 'pinpointe'),
                                     ),
                                     'lock_message' => array(
@@ -355 +357 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>Message to display above signup form.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Message to display above signup form.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -380 +382 @@
                                             '2' => __('Comments Form', 'pinpointe'),
                                         ),
-                                        'hint' => __('<p>Select WordPress forms where you would like mailing database opt-in checkbox to appear.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select WordPress forms where you would like mailing database opt-in checkbox to appear.</p>', 'pinpointe'),
                                     ),
                                     'checkbox_label' => array(
@@ -390 +392 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>Label to display next to the checkbox.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Label to display next to the checkbox.</p>', 'pinpointe'),
                                     ),
                                     'checkbox_state' => array(
@@ -404 +406 @@
                                             '1' => __('Checked', 'pinpointe'),
                                         ),
-                                        'hint' => __('<p>Default checkbox state.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Default checkbox state.</p>', 'pinpointe'),
                                     ),
                                     'checkbox_list' => array(
@@ -414 +416 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>Select one of your Pinpointe mailing databases to subscribe visitors to.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select one of your Pinpointe mailing databases to subscribe visitors to.</p>', 'pinpointe'),
                                     ),
                                 ),
@@ -436 +438 @@
                                         ),
                                         'values' => PinpointeSignupForm::get_all_user_roles(),
-                                        'hint' => __('<p>Select user roles that you would like to synchronize with Pinpointe.</p> <p>This feature sends data to Pinpointe when one of the following actions occur - user is created, user is updated and user is deleted.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select user roles that you would like to synchronize with Pinpointe.</p> <p>This feature sends data to Pinpointe when one of the following actions occur - user is created, user is updated and user is deleted.</p>', 'pinpointe'),
                                     ),
                                     'sync_list' => array(
@@ -446 +448 @@
                                             'empty' => true
                                         ),
-                                        'hint' => __('<p>Select one of your Pinpointe mailing databases to sync user data with.</p>', 'pinpointe'),
+                                        'hint' => esc_html__('<p>Select one of your Pinpointe mailing databases to sync user data with.</p>', 'pinpointe'),
                                     ),
                                 ),

pinpointe-form-integration/trunk/includes/pinpointe-prepare-form.inc.php

@@ -17 +17 @@
         $global_form_id = $pinpointe->get_next_rendered_form_id();
 
+        //get mailing lists
+        $mailing_lists = $pinpointe->get_tag_metadata();
+
+        $mailing_list_settings = [];
+        
         // Extract form id and form settings
         reset($form);
@@ -22 +27 @@
         $form = array_pop($form);
 
+        //loop over to check if show_mailing_lists is on & form_id is same as global_for_id
+        foreach ($mailing_lists as $mailing_list) {
+            if ($mailing_list['form_id'] === $form_key && $mailing_list['show_mailing_list'] === 'on') {
+                $mailing_list_settings = json_decode($mailing_list['tags'], true);
+            }
+        }
+        
         // Title
         $title = ($context == 'widget') ? apply_filters('widget_title', $form['title']) : $form['title'];
@@ -415 +427 @@
         }
 
+        //Mailing list settings
+        if (!empty($mailing_list_settings)) {
+            $html .= "<p class='label'>Please select the mailing list(s) you would like to receive updates from.</p>";
+
+            foreach ($mailing_list_settings as $tag_id => $tag) {
+                $input_id = "pinpointe_tags_" . $context . "_" . $tag_id;
+                $input_name = "pinpointe_".$context .'_subscribe[custom][selected_tags][]';
+
+                $html .= '<label for="'.$input_id .'" style="width: 100%;display: flex; justify-content: space-between;align-items: center; margin-bottom: 5px; width: 100%;">';
+                $html .= '<input type="checkbox" id="'.$input_id .'" name="'.$input_name.'" value="' . $tag_id . '" style="margin-right: 5px;" checked>';
+                $html .= '<div style="flex: 1; text-align: left;">';
+                $html .= '<div style="font-weight: bold; font-size: smaller;">' . $tag['name'] . '</div>';
+                $html .= '<div style="font-size: x-small; color: #777;">' . (empty($tag['description']) ? 'No description' : $tag['description']) . '</div>';
+                $html .= '</div>';
+                $html .= '</label>';
+            }
+        }
+
         // Text below form
         if (isset($form['below']) && $form['below'] != '') {

pinpointe-form-integration/trunk/includes/pinpointe-service.class.php

@@ -95 +95 @@
             );
 
-            $xml = $this->arrayToXml($request, '<xmlrequest />');
-
-            // We have to use DOMDocument now to prevent self closing XML tags since the
-            // Pinpointe API doesn't accept them.
-            $dom_sxe = dom_import_simplexml($xml);
-
-            $dom_output = new DOMDocument('1.0');
-            $dom_output->formatOutput = true;
-            $dom_sxe = $dom_output->importNode($dom_sxe, true);
-            $dom_sxe = $dom_output->appendChild($dom_sxe);
-
-            $xmlStr = $dom_output->saveXML($dom_output, LIBXML_NOEMPTYTAG);
-
-            $file = WP_PLUGIN_DIR."/pinpointe-form-integration/test.xml"; 
-            $dom_output->save($file);
-
             curl_setopt($this->curl, CURLOPT_URL, $this->apiUrl);
-            curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-Type: application/xml'));
-            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $xmlStr);
-
+            $is_json = true;
+            if(strpos($this->apiUrl, 'json') === false){
+                $is_json = false;
+                $xml = $this->arrayToXml($request, '<xmlrequest />');
+                // We have to use DOMDocument now to prevent self closing XML tags since the
+                // Pinpointe API doesn't accept them.
+                $dom_sxe = dom_import_simplexml($xml);
+
+                $dom_output = new DOMDocument('1.0');
+                $dom_output->formatOutput = true;
+                $dom_sxe = $dom_output->importNode($dom_sxe, true);
+                $dom_sxe = $dom_output->appendChild($dom_sxe);
+
+                $post_data = $dom_output->saveXML($dom_output, LIBXML_NOEMPTYTAG);
+
+                $file = WP_PLUGIN_DIR."/pinpointe-form-integration/test.xml"; 
+                $dom_output->save($file);
+
+                curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-Type: application/xml'));
+            } else {
+                $post_data = json_encode($request);
+                curl_setopt($this->curl, CURLOPT_HTTPHEADER, array('Content-Type: application/json'));
+            }
+
+            curl_setopt($this->curl, CURLOPT_POSTFIELDS, $post_data);
             $responseBody = @curl_exec($this->curl);
 
@@ -121 +127 @@
             }
 
-            $responseXml = simplexml_load_string($responseBody);
-
-            if ($responseXml->status == 'SUCCESS') {
-                if($data['id'] == '-999') return true;
-                return $this->xmlToArray($responseXml->data);
+            $response = $is_json ? json_decode($responseBody) : simplexml_load_string($responseBody);
+
+            if ($response->status == 'SUCCESS') {
+                if (isset($data['id']) && $data['id'] == '-999') {
+                    return true;
+                }
+                return $this->xmlToArray($response->data);
             } 
             else {
@@ -148 +156 @@
                 if (is_array($value)) {
                     if ($key != 'value') {
-                        $child = $root->addChild($key);
-
-                        $this->arrayToXml($value, $child);
+                        if ($key == 'tags') {
+                            foreach ($value as $tag) {
+                                $child = $root->addChild('tag', $tag);
+                            }
+                        } else {
+                            $child = $root->addChild($key);
+                            $this->arrayToXml($value, $child);
+                        }
                     } else {
                         foreach ($value as $k => $v) {
@@ -237 +250 @@
 
             foreach($id as $i) {
-                $mergeVarForList = $this->call('lists', 'GetCustomFields', [
-                    'listids' => $i
-                ])['item'];
+                $response = $this->call('lists', 'GetCustomFields', ['listids' => $i]);
+                
+                // for xml item exists, for json item doesnot exist
+                $mergeVarForList = isset($response['item']) ? $response['item']: $response;
 
                 $mergeVars = [
@@ -250 +264 @@
 
                 foreach($mergeVarForList as $mergeVar) {
-                    $settings = $this->mb_unserialize($mergeVar['fieldsettings']);
+                    $settings = $mergeVar['fieldsettings'];
+
+                    // Check if $settings is a serialized string, and unserialize if needed
+                    if (is_string($settings) && ($unserialized = $this->mb_unserialize($settings)) !== false) {
+                        $settings = $unserialized;
+                    }
 
                     $mergeVars[$mergeVar['fieldid']] = [
@@ -260 +279 @@
                     if($mergeVar['fieldtype'] == 'dropdown' || $mergeVar['fieldtype'] == 'checkbox' || $mergeVar['fieldtype'] == 'radiobutton') {
                         $choices = [];
-                        foreach($settings['Key'] as $index => $key) {
-                            $choices[$key] = $settings['Value'][$index];
+                        if (isset($settings['fieldsettings']) && is_array($settings['fieldsettings'])) {
+                            foreach ($settings['fieldsettings'] as $key => $value) {
+                                $choices[$key] = $value;
+                            }
                         }
 
@@ -284 +305 @@
          */
         function mb_unserialize($string) {
-            $string = preg_replace('!s:(\d+):"(.*?)";!se', "'s:'.strlen('$2').':\"$2\";'", $string);
+            if (is_array($string)) {
+                return $string;
+            }
+            if (@unserialize($string) === false) {
+                return $string;
+            }
+
+            $string = preg_replace_callback(
+                '/s:(\d+):"(.*?)";/',
+                function ($matches) {
+                    return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';
+                },
+                $string
+            );
+
             return unserialize($string);
         }
@@ -298 +333 @@
          */
         public function lists_subscribe($id, $email, $merge_vars = array(), $email_type = 'html',
-                                        $add_to_autoresponders = false, $update_existing = false, $tagid, $send_confirmation) {
+                                        $add_to_autoresponders = false, $update_existing = false, $tag_ids, $send_confirmation = false, $custom_data = []) {
             if(!is_string($email)) {
                 $email = $email['email'];
@@ -310 +345 @@
             );
 
-            if (!empty($tagid))
-                $data['tag'] = $tagid;
+            if (!empty($tag_ids))
+                $data['tags'] = $tag_ids;
 
             if ($send_confirmation) {
                 $data['confirmed'] = 'no';
                 $data['send_confirmation'] = 'true';
+            }
+
+            if(!empty($custom_data['html_confirmation_email'])){
+                $data['html_confirmation_email'] = $custom_data['html_confirmation_email'];
             }
 

pinpointe-form-integration/trunk/includes/pinpointe-widget.class.php

@@ -11 +11 @@
     class Pinpointe_Widget extends WP_Widget
     {
+        public $opt;
+        public $settings;
+       
         /**
          * Widget constructor (registering widget with WP)
@@ -89 +92 @@
             $form_html = pinpointe_prepare_form($form, $this->opt, 'widget', $args);
 
-            echo $form_html;
+            echo wp_kses_post($form_html);
         }
 
@@ -107 +110 @@
 
             <p>
-                <?php printf(__('This widget renders a Pinpointe signup form.<br />You can edit signup forms <a href="%s">here</a>.', 'pinpointe'), site_url('/wp-admin/admin.php?page=pinpointe')); ?>
+                <?php printf(esc_html__('This widget renders a Pinpointe signup form.<br />You can edit signup forms <a href="%s">here</a>.', 'pinpointe'), esc_url(site_url('/wp-admin/admin.php?page=pinpointe'))); ?>
             </p>
             <p>
-                <label for="<?php echo $this->get_field_id('allowed_forms'); ?>"><?php _e('Allow only these forms (comma-separated IDs):', 'pinpointe'); ?></label>
-                <input class="widefat" id="<?php echo $this->get_field_id('allowed_forms'); ?>" name="<?php echo $this->get_field_name('allowed_forms'); ?>" type="text" value="<?php echo esc_attr($allowed_forms); ?>" />
+                <label for="<?php echo esc_attr($this->get_field_id('allowed_forms')); ?>"><?php esc_html_e('Allow only these forms (comma-separated IDs):', 'pinpointe'); ?></label>
+                <input class="widefat" id="<?php echo esc_attr($this->get_field_id('allowed_forms')); ?>" name="<?php echo esc_attr($this->get_field_name('allowed_forms')); ?>" type="text" value="<?php echo esc_attr($allowed_forms); ?>" />
             </p>
 
@@ -130 +133 @@
 
             // Get allowed forms
-            $instance['allowed_forms'] = (!empty($new_instance['allowed_forms'])) ? strip_tags($new_instance['allowed_forms']) : '';
+            $instance['allowed_forms'] = (!empty($new_instance['allowed_forms'])) ? wp_strip_all_tags($new_instance['allowed_forms']) : '';
 
             if ($instance['allowed_forms'] != '' && preg_match('/^([0-9]+,?)+$/', $instance['allowed_forms'])) {

pinpointe-form-integration/trunk/pinpointe-signup-form.php

@@ -5 +5 @@
  * Plugin URI: https://help.pinpointe.com/support/solutions/articles/5000664320-wordpress-plugin-download
  * Description: Add Pinpointe forms to your WordPress site
- * Version: 1.5
+ * Version: 1.6
  * Author: Pinpointe
  * Author URI: http://www.pinpointe.com/
  * Requires at least: 3.5
- * Tested up to: 5.7.2
+ * Tested up to: 6.4.2
  *
  * Text Domain: pinpointe
@@ -27 +27 @@
 define('PINPOINTE_PLUGIN_PATH', untrailingslashit(plugin_dir_path(__FILE__)));
 define('PINPOINTE_PLUGIN_URL', plugins_url(basename(plugin_dir_path(__FILE__)), basename(__FILE__)));
-define('PINPOINTE_VERSION', '2.2.0'); // Increment this to force cached JS to reload
+define('PINPOINTE_VERSION', '2.2.1'); // Increment this to force cached JS to reload
 
 if (!class_exists('PinpointeSignupForm')) {
@@ -43 +43 @@
         private $popup_page_capping_in_effect = false;
 
+
+          //define dynamically assigned vars
+          public $settings;
+          public $hints;
+          public $validation;
+          public $titles;
+          public $options;
+          public $section_info;
+          public $default_tabs;
+          public $opt;
+          public $pinpointe;
+
         /**
          * Singleton control
@@ -88 +100 @@
 
                     // Load scripts/styles conditionally
-                    if (preg_match('/page=pinpointe/i', $_SERVER['QUERY_STRING']) && !preg_match('/page=pinpointe_lite/i', $_SERVER['QUERY_STRING'])) {
+                    if (isset($_SERVER['QUERY_STRING']) && preg_match('/page=pinpointe/i', $_SERVER['QUERY_STRING']) && !preg_match('/page=pinpointe_lite/i', $_SERVER['QUERY_STRING'])) {
                         add_action('admin_enqueue_scripts', array($this, 'enqueue_admin_scripts_and_styles'));
-                    }
+                     }
                 }
 
@@ -133 +145 @@
              * For all
              */
-            add_action('widgets_init', create_function('', 'return register_widget("Pinpointe_Widget");'));
+
+            // Start session on init hook.
+            add_action('init',[$this,'init_session']);
+
+            add_action('widgets_init', function () {
+                return register_widget("Pinpointe_Widget");
+            });
+
             add_shortcode('pinpointe_form', array($this, 'subscription_shortcode'));
+            add_shortcode('pinpointe_powered_by', array($this, 'powered_by_shortcode'));
+            add_shortcode('pinpointe_email_sent_to', array($this, 'email_sent_to_shortcode'));
+            add_shortcode('pinpointe_confirm_link', array($this, 'confirm_link_shortcode'));
+            add_shortcode('pinpointe_confirm_link_href', array($this, 'confirm_link_href_shortcode'));
             register_uninstall_hook(__FILE__, array('PinpointeSignupForm', 'uninstall'));
+
+            // validate the short codes before we do anything else
+            $this->validate_all_shortcodes();
 
             /**
@@ -150 +176 @@
             add_action('wp_ajax_nopriv_pinpointe_subscribe', array($this, 'ajax_subscribe'));
 
+        }
+        function init_session() {
+            if (!session_id()) {
+                session_start();
+            }
+        }
+       
+         /**
+         * Validate all shortcodes and display warnings for missing ones.
+         * 
+         * @return void
+         */
+        public function validate_all_shortcodes()
+        {
+            /**
+             * Shortcodes to check for existence.
+             *
+             * @var string[]
+             */
+            $shortcodes_to_check = array(
+                'pinpointe_form',
+                'pinpointe_powered_by',
+                'pinpointe_email_sent_to',
+                'pinpointe_confirm_link',
+                'pinpointe_confirm_link_href',
+            );
+
+            foreach ($shortcodes_to_check as $shortcode){
+                if (!shortcode_exists($shortcode)){
+                    $warning_message = sprintf(
+                        __('Warning: Missing %s shortcode!', 'pinpointe'),
+                        $shortcode
+                    );
+
+                    add_action('admin_notices', function () use ($warning_message) {
+                        echo '<div class="notice notice-error"><p>' . esc_html($warning_message) . '</p></div>';
+                    });
+                }
+            }
         }
 
@@ -417 +482 @@
                 foreach ($page_value['children'] as $subpage => $subpage_value) {
                     $class = ($subpage == $current_tab) ? ' nav-tab-active' : '';
-                    echo '<a class="nav-tab'.$class.'" href="?page='.preg_replace('/_/', '-', $page).'&tab='.$subpage.'">'.((isset($subpage_value['icon']) && !empty($subpage_value['icon'])) ? $subpage_value['icon'] . ($subpage_value['title'] != '' ? '&nbsp;' : '') : '').$subpage_value['title'].'</a>';
+                    $href = "?page=" . preg_replace('/_/', '-', $page)."&tab=".$subpage;
+                    $link_value = ((isset($subpage_value['icon']) && !empty($subpage_value['icon']))
+                            ? $subpage_value['icon'] . ($subpage_value['title'] != '' ? '&nbsp;' : '')
+                            : '') .$subpage_value['title'];
+                    echo '<a class="nav-tab'.esc_attr($class).'" href="'. esc_url($href).'">'.wp_kses_post($link_value)
+                        .'</a>';
                 }
             }
@@ -497 +567 @@
                         <div class="pinpointe-left">
                             <form method="post" action="options.php" enctype="multipart/form-data">
-                                <input type="hidden" name="current_tab" value="<?php echo $current_tab; ?>" />
+                                <input type="hidden" name="current_tab" value="<?php echo esc_attr($current_tab); ?>" />
 
 
@@ -507 +577 @@
 
                                     if ($current_tab == 'forms') {
-                                        echo '<div style="width:100%;text-align:center;border-top:1px solid #dfdfdf;padding:18px;"><a href="' . admin_url('/options-general.php?page=pinpointe&tab=help') . '">' . __('How do I display my forms?', 'pinpointe') . '</a></div>';
+                                        echo '<div style="width:100%;text-align:center;border-top:1px solid #dfdfdf;padding:18px;"><a href="' . esc_url(admin_url('/options-general.php?page=pinpointe&tab=help')) . '">' . esc_html__('How do I display my forms?', 'pinpointe') . '</a></div>';
                                     }
                                     else if ($current_tab == 'help') {
@@ -541 +611 @@
 
                         $pinpointe_selected_tags[$form_key] = array(
-                            'tag'       => $form['tag']
+                            'tags'       => $form['tags']
                         );
                     }
@@ -554 +624 @@
                  */
                 $forms_page_hints = array(
-                    'pinpointe_forms_title_field'              => __('<p>Title of the form - will be displayed in a signup form header.</p>', 'pinpointe'),
-                    'pinpointe_forms_above_field'              => __('<p>Message to display above form fields.</p>', 'pinpointe'),
-                    'pinpointe_forms_below_field'              => __('<p>Message to display below form fields.</p>', 'pinpointe'),
-                    'pinpointe_forms_button_field'             => __('<p>Form submit button label.</p>', 'pinpointe'),
-                    'pinpointe_forms_color_scheme'             => __('<p>Select one of the predefined color schemes. You can further customize the look & feel of your forms by adding custom CSS rules to Settings > Override CSS.</p>', 'pinpointe'),
-                    'pinpointe_forms_redirect_url'             => __('<p>Optionaly provide an URL where subscribers should be redirected to after successful signup.</p> <p>Leave this field empty to simply display a thank you message.</p>', 'pinpointe'),
-                    'pinpointe_forms_mailing_list'             => __('<p>Select one of your Pinpointe mailing databases for users to be subscribed to.</p>', 'pinpointe'),
-                    'pinpointe_forms_mailing_tag'             => __('<p>Select one of your Pinpointe lists for users to be added to.</p>', 'pinpointe'),
-                    'pinpointe_forms_groups'                   => __('<p>Select interest groups that you want to add automatically or allow users to choose in the form.</p> <p>If no interest groups are available, either mailing list has not been selected yet in the field above or you have no interest groups created for this list.</p>', 'pinpointe'),
-                    'pinpointe_form_group_method'              => __('<p>Select how you would like interest groups to work with this form - you can either add all selected interest groups to subscribers profile by default or allow your visitors to manually select some.</p>', 'pinpointe'),
-                    'form_condition_key'                    => __('<p>Controls on which parts of the website this form will appear (or not appear).</p>', 'pinpointe'),
-                    'form_condition_value_pages'            => __('<p>List of pages to check current page against.</p>', 'pinpointe'),
-                    'form_condition_value_posts'            => __('<p>List of posts to check current post against.</p>', 'pinpointe'),
-                    'form_condition_value_post_categories'  => __('<p>List of post categories to check current post against.</p>', 'pinpointe'),
-                    'form_condition_value_url'              => __('<p>URL fragment to search in the URL of the page.</p>', 'pinpointe'),
-                    'pinpointe_forms_send_confirmation'     => __('<p>Whether or not to send a confirmation email to subscribers when they submit a subscription form. If selected, subscriptions will be recorded, but subscribers will be marked as Unconfirmed until they receive and choose to confirm their subscription via email.</p>', 'pinpointe'),
+                    'pinpointe_forms_title_field'              => esc_html__('<p>Title of the form - will be displayed in a signup form header.</p>', 'pinpointe'),
+                    'pinpointe_forms_above_field'              => esc_html__('<p>Message to display above form fields.</p>', 'pinpointe'),
+                    'pinpointe_forms_below_field'              => esc_html__('<p>Message to display below form fields.</p>', 'pinpointe'),
+                    'pinpointe_forms_button_field'             => esc_html__('<p>Form submit button label.</p>', 'pinpointe'),
+                    'pinpointe_forms_color_scheme'             => esc_html__('<p>Select one of the predefined color schemes. You can further customize the look & feel of your forms by adding custom CSS rules to Settings > Override CSS.</p>', 'pinpointe'),
+                    'pinpointe_forms_redirect_url'             => esc_html__('<p>Optionaly provide an URL where subscribers should be redirected to after successful signup.</p> <p>Leave this field empty to simply display a thank you message.</p>', 'pinpointe'),
+                    'pinpointe_forms_mailing_list'             => esc_html__('<p>Select one of your Pinpointe mailing databases for users to be subscribed to.</p>', 'pinpointe'),
+                    'pinpointe_forms_mailing_tag'             => esc_html__('<p>Select one of your Pinpointe lists for users to be added to.</p>', 'pinpointe'),
+                    'pinpointe_forms_groups'                   => esc_html__('<p>Select interest groups that you want to add automatically or allow users to choose in the form.</p> <p>If no interest groups are available, either mailing list has not been selected yet in the field above or you have no interest groups created for this list.</p>', 'pinpointe'),
+                    'pinpointe_form_group_method'              => esc_html__('<p>Select how you would like interest groups to work with this form - you can either add all selected interest groups to subscribers profile by default or allow your visitors to manually select some.</p>', 'pinpointe'),
+                    'form_condition_key'                    => esc_html__('<p>Controls on which parts of the website this form will appear (or not appear).</p>', 'pinpointe'),
+                    'form_condition_value_pages'            => esc_html__('<p>List of pages to check current page against.</p>', 'pinpointe'),
+                    'form_condition_value_posts'            => esc_html__('<p>List of posts to check current post against.</p>', 'pinpointe'),
+                    'form_condition_value_post_categories'  => esc_html__('<p>List of post categories to check current post against.</p>', 'pinpointe'),
+                    'form_condition_value_url'              => esc_html__('<p>URL fragment to search in the URL of the page.</p>', 'pinpointe'),
+                    'pinpointe_forms_send_confirmation'     => esc_html__('<p>Whether or not to send a confirmation email to subscribers when they submit a subscription form. If selected, subscriptions will be recorded, but subscribers will be marked as Unconfirmed until they receive and choose to confirm their subscription via email.</p>', 'pinpointe'),
                 );
 
@@ -577 +647 @@
                     var pinpointe_hints = <?php echo json_encode($this->hints); ?>;
                     var pinpointe_forms_hints = <?php echo json_encode($forms_page_hints); ?>;
-                    var pinpointe_home_url = '<?php echo site_url(); ?>';
-                    var pinpointe_label_still_connecting_to_pinpointe = '<?php _e('Still connecting to Pinpointe...', 'pinpointe'); ?>';
-                    var pinpointe_label_mailing_list = '<?php _e('Mailing database', 'pinpointe'); ?>';
-                    var pinpointe_label_mailing_tag = '<?php _e('Mailing list', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_list = '<?php _e('There are no databases named', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_tag = '<?php _e('There are no lists named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_mailing_list = '<?php _e('Select a mailing database', 'pinpointe'); ?>';
-                    var pinpointe_label_select_mailing_tag = '<?php _e('Select a mailing list', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_groups = '<?php _e('Selected database does not have groups named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_some_groups = '<?php _e('Select some groups (optional)', 'pinpointe'); ?>';
-                    var pinpointe_label_groups = '<?php _e('Interest groups', 'pinpointe'); ?>';
-                    var pinpointe_label_fields_name = '<?php _e('Field Label', 'pinpointe'); ?>';
-                    var pinpointe_label_fields_tag = '<?php _e('Pinpointe Field', 'pinpointe'); ?>'; // Changed from 'Pinpointe Tag'
-                    var pinpointe_label_fields_icon = '<?php _e('Icon', 'pinpointe'); ?>';
-                    var pinpointe_label_add_new = '<?php _e('Add Field', 'pinpointe'); ?>'; // Changed from 'Add Tag'
-                    var pinpointe_label_no_results_match_tags = '<?php _e('Selected database does not have fields named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_tag = '<?php _e('Select a field', 'pinpointe'); ?>'; // Changed from 'Select a tag'
-                    var pinpointe_label_connecting_to_pinpointe = '<?php _e('Connecting to Pinpointe...', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_pages = '<?php _e('No pages named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_some_pages = '<?php _e('Select some pages', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_posts = '<?php _e('No posts named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_some_posts = '<?php _e('Select some posts', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_post_categories = '<?php _e('No post categories named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_some_post_categories = '<?php _e('Select some post categories', 'pinpointe'); ?>';
-                    var pinpointe_label_no_results_match_forms = '<?php _e('No forms named', 'pinpointe'); ?>';
-                    var pinpointe_label_select_some_forms = '<?php _e('Select forms here', 'pinpointe'); ?>';
-                    var pinpointe_label_signup_form_no = '<?php _e('Signup Form #', 'pinpointe'); ?>';
-                    var pinpointe_label_email = '<?php _e('Email', 'pinpointe'); ?>';
-                    var pinpointe_label_button = '<?php _e('Submit', 'pinpointe'); ?>';
+                    var pinpointe_home_url = '<?php echo esc_url(site_url()); ?>';
+                    var pinpointe_label_still_connecting_to_pinpointe = '<?php esc_html_e('Still connecting to Pinpointe...', 'pinpointe'); ?>';
+                    var pinpointe_label_mailing_list = '<?php esc_html_e('Mailing database', 'pinpointe'); ?>';
+                    var pinpointe_label_mailing_tag = '<?php esc_html_e('Mailing list', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_list = '<?php esc_html_e('There are no databases named', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_tag = '<?php esc_html_e('There are no lists named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_mailing_list = '<?php esc_html_e('Select a mailing database', 'pinpointe'); ?>';
+                    var pinpointe_label_select_mailing_tag = '<?php esc_html_e('Select a mailing list', 'pinpointe');
+                    ?>';
+                    var pinpointe_label_no_results_match_groups = '<?php esc_html_e('Selected database does not have groups named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_some_groups = '<?php esc_html_e('Select some groups (optional)', 'pinpointe'); ?>';
+                    var pinpointe_label_groups = '<?php esc_html_e('Interest groups', 'pinpointe'); ?>';
+                    var pinpointe_label_fields_name = '<?php esc_html_e('Field Label', 'pinpointe'); ?>';
+                    var pinpointe_label_fields_tag = '<?php esc_html_e('Pinpointe Field', 'pinpointe'); ?>'; //
+                    // Changed from 'Pinpointe Tag'
+                    var pinpointe_label_fields_icon = '<?php esc_html_e('Icon', 'pinpointe'); ?>';
+                    var pinpointe_label_add_new = '<?php esc_html_e('Add Field', 'pinpointe'); ?>'; // Changed from
+                    // 'Add Tag'
+                    var pinpointe_label_no_results_match_tags = '<?php esc_html_e('Selected database does not have fields named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_tag = '<?php esc_html_e('Select a field', 'pinpointe'); ?>'; //
+                    // Changed from 'Select a tag'
+                    var pinpointe_label_connecting_to_pinpointe = '<?php esc_html_e('Connecting to Pinpointe...', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_pages = '<?php esc_html_e('No pages named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_some_pages = '<?php esc_html_e('Select some pages', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_posts = '<?php esc_html_e('No posts named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_some_posts = '<?php esc_html_e('Select some posts', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_post_categories = '<?php esc_html_e('No post categories named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_some_post_categories = '<?php esc_html_e('Select some post categories', 'pinpointe'); ?>';
+                    var pinpointe_label_no_results_match_forms = '<?php esc_html_e('No forms named', 'pinpointe'); ?>';
+                    var pinpointe_label_select_some_forms = '<?php esc_html_e('Select forms here', 'pinpointe'); ?>';
+                    var pinpointe_label_signup_form_no = '<?php esc_html_e('Signup Form #', 'pinpointe'); ?>';
+                    var pinpointe_label_email = '<?php esc_html_e('Email', 'pinpointe'); ?>';
+                    var pinpointe_label_button = '<?php esc_html_e('Submit', 'pinpointe'); ?>';
                     var pinpointe_font_awesome_icons = <?php echo json_encode($this->get_font_awesome_icons()); ?>;
-                    var pinpointe_label_bad_ajax_response = '<?php printf(__('%s Response received from your server is malformed.', 'pinpointe'), '<i class="fa fa-times" style="font-size: 1.5em; color: red;"></i>'); ?>';
-                    var pinpointe_label_integration_status = '<?php _e('Integration status', 'pinpointe'); ?>';
+                    var pinpointe_label_bad_ajax_response = '<?php printf(esc_html__('%s Response received from your server is malformed.', 'pinpointe'), '<i class="fa fa-times" style="font-size: 1.5em; color: red;"></i>'); ?>';
+                    var pinpointe_label_integration_status = '<?php esc_html_e('Integration status', 'pinpointe'); ?>';
 
                     <?php if ($current_tab == 'forms'): ?>
@@ -616 +690 @@
 
                     <?php if ($current_tab == 'checkboxes'): ?>
-                        var pinpointe_selected_list = '<?php echo (isset($this->opt['pinpointe_checkbox_list']) ? $this->opt['pinpointe_checkbox_list'] : ''); ?>';
+                        var pinpointe_selected_list = '<?php echo esc_html(isset($this->opt['pinpointe_checkbox_list']) ? $this->opt['pinpointe_checkbox_list'] : ''); ?>';
                     <?php endif; ?>
 
                     <?php if ($current_tab == 'sync'): ?>
-                        var pinpointe_selected_list = '<?php echo (isset($this->opt['pinpointe_sync_list']) ? $this->opt['pinpointe_sync_list'] : ''); ?>';
+                        var pinpointe_selected_list = '<?php echo esc_html(isset($this->opt['pinpointe_sync_list']) ? $this->opt['pinpointe_sync_list'] : ''); ?>';
                     <?php endif; ?>
 
@@ -637 +711 @@
         {
             if (isset($this->section_info[$section['id']])) {
-                echo $this->section_info[$section['id']];
+                echo esc_html($this->section_info[$section['id']]);
             }
 
@@ -645 +719 @@
                     ?>
                     <div class="pinpointe-forms">
-                        <p><?php printf(__('You must <a href="%s">enter</a> your Pinpointe API key to use this feature.', 'pinpointe'), admin_url('/options-general.php?page=pinpointe&tab=settings')); ?></p>
+                        <p><?php printf(esc_html__('You must <a href="%s">enter</a> your Pinpointe API key to use this feature.', 'pinpointe'), esc_url(admin_url('/options-general.php?page=pinpointe&tab=settings'))); ?></p>
                     </div>
                     <?php
@@ -853 +927 @@
                             );
                             $pinpointe_selected_tags[$form_key] = array(
-                                'tag'       => $form['tag']
+                                'tags'       => $form['tags']
                             );
                         }
@@ -878 +952 @@
                         $pinpointe_selected_tags = array();
                     }
-
+                    ob_start();
+                    require PINPOINTE_PLUGIN_PATH . '/includes/pinpointe-confirmation-email.inc.php';
+                    $default_confirmation_email_html = ob_get_clean();
                     ?>
 
@@ -886 +962 @@
                         <?php foreach ($saved_forms as $form_key => $form): ?>
 
-                            <div id="pinpointe_forms_list_<?php echo $form_key; ?>">
-                                <h4 class="pinpointe_forms_handle"><span class="pinpointe_forms_title" id="pinpointe_forms_title_<?php echo $form_key; ?>"><?php _e('Signup Form #', 'pinpointe'); ?><?php echo $form_key; ?></span>&nbsp;<span class="pinpointe_forms_title_name"><?php echo (!empty($form['title'])) ? '- ' . $form['title'] : ''; ?></span><span class="pinpointe_forms_remove" id="pinpointe_forms_remove_<?php echo $form_key; ?>" title="<?php _e('Remove', 'pinpointe'); ?>"><i class="fa fa-times"></i></span></h4>
+                            <div id="pinpointe_forms_list_<?php echo esc_attr($form_key); ?>">
+                                <h4 class="pinpointe_forms_handle"><span class="pinpointe_forms_title" id="pinpointe_forms_title_<?php echo esc_attr($form_key); ?>"><?php esc_html_e('Signup Form #', 'pinpointe'); ?><?php echo esc_html($form_key); ?></span>&nbsp;<span class="pinpointe_forms_title_name"><?php echo (!empty($form['title'])) ? '- ' . esc_html($form['title']) : ''; ?></span><span class="pinpointe_forms_remove" id="pinpointe_forms_remove_<?php echo esc_attr($form_key); ?>" title="<?php esc_html_e('Remove', 'pinpointe'); ?>"><i class="fa fa-times"></i></span></h4>
                                 <div style="clear:both;">
 
-                                    <div class="pinpointe_forms_section"><?php _e('Main Settings', 'pinpointe'); ?></div>
+                                    <div class="pinpointe_forms_section"><?php esc_html_e('Main Settings', 'pinpointe'); ?></div>
                                     <table class="form-table"><tbody>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Form title', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_title_field_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][title]" value="<?php echo htmlentities($form['title']); ?>" class="pinpointe-field pinpointe_forms_title_field"></td>
+                                            <th scope="row"><?php esc_html_e('Form title', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_title_field_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][title]" value="<?php echo esc_attr($form['title']); ?>" class="pinpointe-field pinpointe_forms_title_field"></td>
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Text above form', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_above_field_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][above]" value="<?php echo htmlentities($form['above']); ?>" class="pinpointe-field pinpointe_forms_above_field"></td>
+                                            <th scope="row"><?php esc_html_e('Text above form', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_above_field_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][above]" value="<?php echo esc_attr($form['above']); ?>" class="pinpointe-field pinpointe_forms_above_field"></td>
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Text below form', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_below_field_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][below]" value="<?php echo htmlentities($form['below']); ?>" class="pinpointe-field pinpointe_forms_below_field"></td>
+                                            <th scope="row"><?php esc_html_e('Text below form', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_below_field_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][below]" value="<?php echo esc_attr($form['below']); ?>" class="pinpointe-field pinpointe_forms_below_field"></td>
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Submit button label', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_button_field_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][button]" value="<?php echo htmlentities($form['button']); ?>" class="pinpointe-field pinpointe_forms_button_field"></td>
+                                            <th scope="row"><?php esc_html_e('Submit button label', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_button_field_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][button]" value="<?php echo isset($form['button']) ? esc_attr($form['button']) : ''; ?>" class="pinpointe-field pinpointe_forms_button_field"></td>
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Color scheme', 'pinpointe'); ?></th>
-                                            <td><select id="pinpointe_forms_color_scheme_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][color_scheme]" class="pinpointe-field pinpointe_forms_color_scheme">
+                                            <th scope="row"><?php esc_html_e('Color scheme', 'pinpointe'); ?></th>
+                                            <td><select id="pinpointe_forms_color_scheme_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][color_scheme]" class="pinpointe-field pinpointe_forms_color_scheme">
 
                                                 <?php
                                                     foreach ($color_schemes as $scheme_value => $scheme_title) {
                                                         $is_selected = ((isset($form['color_scheme']) && $form['color_scheme'] == $scheme_value) ? 'selected="selected"' : '');
-                                                        echo '<option value="' . $scheme_value . '" ' . $is_selected . '>' . $scheme_title . '</option>';
+                                                        echo '<option value="' . esc_attr($scheme_value) . '" ' . esc_attr($is_selected) . '>' . esc_html($scheme_title) . '</option>';
                                                     }
                                                 ?>
@@ -922 +998 @@
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Success redirect URL', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_redirect_url_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][redirect_url]" value="<?php echo $form['redirect_url']; ?>" class="pinpointe-field pinpointe_forms_redirect_url"></td>
+                                            <th scope="row"><?php esc_html_e('Success redirect URL', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_redirect_url_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][redirect_url]" value="<?php echo isset($form['redirect_url']) ? esc_attr($form['redirect_url']) : ''; ?>" class="pinpointe-field pinpointe_forms_redirect_url"></td>
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Send confirmation email', 'pinpointe'); ?></th>
+                                            <th scope="row"><?php esc_html_e('Send confirmation email', 'pinpointe'); ?></th>
                                             <td>
                                                 <?php
-                                                    echo '<input type="checkbox" id="pinpointe_forms_send_confirmation_' . $form_key . '" name="pinpointe_options[forms][' . $form_key . '][send_confirmation]" class="pinpointe-field pinpointe_forms_send_confirmation" ' . ($form['send_confirmation'] ? "checked" : '') . '>';
+                                                    echo '<input type="checkbox" id="pinpointe_forms_send_confirmation_' . esc_attr($form_key) . '" name="pinpointe_options[forms][' . esc_attr($form_key) . '][send_confirmation]" class="pinpointe-field pinpointe_forms_send_confirmation" ' . (isset($form['send_confirmation']) && $form['send_confirmation'] ? "checked" : '') . '>';
                                                 ?>
                                             </td>
                                         </tr>
+                                        <tr valign="top" class="pinpointe_forms_confirmation_email_trs">
+                                            <th scope="row"><?php esc_html_e('Override default confirmation email', 'pinpointe'); ?></th>
+                                            <td>
+                                                <?php
+                                                   echo '<input type="checkbox" id="pinpointe_forms_overide_confirmation_' . esc_attr($form_key) . '" name="pinpointe_options[forms][' . esc_attr($form_key) . '][overide_confirmation]" class="pinpointe-field pinpointe_forms_overide_confirmation" ' . (isset($form['overide_confirmation']) && $form['overide_confirmation'] ? "checked" : '') . '>';
+                                                ?>
+                                            </td>
+                                        </tr>
+                                        <tr valign="top" class="pinpointe_forms_confirmation_email_trs pinpointe_forms_confirmation_email_tr">
+                                            <td scope="row" colspan="2" id="forms_confirmation_email_td_<?php echo esc_attr($form_key) ?>"><strong><?php esc_html_e('Confirmation email', 'pinpointe'); ?></strong>
+                                            <br/>
+                                            <?php 
+                                                        wp_enqueue_editor();
+                                                        $editor_key = 'pinpointe_forms_html_confirmation_email_' . $form_key;
+
+                                                        $content = isset($form['html_confirmation_email']) && !empty($form['html_confirmation_email']) ? $form['html_confirmation_email'] :
+                                                        $default_confirmation_email_html;
+
+                                                        $textarea_name = 'pinpointe_options[forms][' . $form_key . '][html_confirmation_email]';
+
+                                                        echo '<textarea class="pinpointe-field pinpointe_forms_html_confirmation_email" name="' .  esc_attr($textarea_name) . '" id="' . esc_attr($editor_key) . '" rows="25" style="width:100%">' .  esc_textarea($content) . '</textarea>';
+                                                        
+                                                        ?>
+                                            </td>
+                                        </tr>
                                     </tbody></table>
 
                                     <div class="pinpointe_forms_section">Database</div>
-                                    <p id="pinpointe_forms_list_<?php echo $form_key; ?>" class="pinpointe_loading_list pinpointe_forms_field_list_groups">
+                                    <p id="pinpointe_forms_list_<?php echo esc_attr($form_key); ?>" class="pinpointe_loading_list pinpointe_forms_field_list_groups">
                                         <span class="pinpointe_loading_icon"></span>
-                                        <?php _e('Connecting to Pinpointe...', 'pinpointe'); ?>
+                                        <?php esc_html_e('Connecting to Pinpointe...', 'pinpointe'); ?>
                                     </p>
 
                                     <div class="pinpointe_forms_section">List</div>
-                                    <p id="pinpointe_forms_tag_<?php echo $form_key; ?>" class="pinpointe_loading_tag pinpointe_forms_field_tag_groups">
+                                
+                                    <p id="pinpointe_forms_tag_<?php echo esc_attr($form_key); ?>" class="pinpointe_loading_tag pinpointe_forms_field_tag_groups">
                                         <span class="pinpointe_loading_icon"></span>
-                                        <?php _e('Connecting to Pinpointe...', 'pinpointe'); ?>
+                                        <?php esc_html_e('Connecting to Pinpointe...', 'pinpointe'); ?>
                                     </p>
+                                    
+                                    <table class="form-table">
+                                          <tbody>
+                                              <tr valign="top">
+                                                  <th scope="row"><?php esc_html_e('Show Mailing lists', 'pinpointe'); ?></th>
+                                                  <td>
+                                                      <?php
+                                                       echo '<input type="checkbox" id="pinpointe_forms_show_mailing_list' . esc_attr($form_key) . '" name="pinpointe_options[forms][' . esc_attr($form_key) . '][show_mailing_list]" class="pinpointe-field pinpointe_forms_show_mailing_list" ' . (isset($form['show_mailing_list']) && $form['show_mailing_list'] === 'on' ? "checked" : '') . '>';
+                                                       ?>
+                                               </td>
+                                            </tr>
+                                        </tbody>                  
+                                    </table>
 
                                     <div class="pinpointe_forms_section">Form Fields</div>
-                                    <p id="pinpointe_fields_table_<?php echo $form_key; ?>" class="pinpointe_loading_list pinpointe_forms_field_fields">
+                                    <p id="pinpointe_fields_table_<?php echo esc_attr($form_key); ?>" class="pinpointe_loading_list pinpointe_forms_field_fields">
                                         <span class="pinpointe_loading_icon"></span>
-                                        <?php _e('Connecting to Pinpointe...', 'pinpointe'); ?>
+                                        <?php esc_html_e('Connecting to Pinpointe...', 'pinpointe'); ?>
                                     </p>
 
@@ -956 +1071 @@
                                     <table class="form-table"><tbody>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Display condition', 'pinpointe'); ?></th>
-                                            <td><select id="pinpointe_forms_condition_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][condition]" class="pinpointe-field form_condition_key">
+                                            <th scope="row"><?php esc_html_e('Display condition', 'pinpointe'); ?></th>
+                                            <td><select id="pinpointe_forms_condition_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][condition]" class="pinpointe-field form_condition_key">
 
                                                 <?php
                                                 foreach ($condition_options as $cond_cat) {
-                                                    echo '<optgroup label="' . $cond_cat['title'] . '">';
+                                                    echo '<optgroup label="' . esc_attr($cond_cat['title']) . '">';
 
                                                     foreach ($cond_cat['children'] as $cond_value => $cond_title) {
                                                         $is_selected = (is_array($form['condition']) && isset($form['condition']['key']) && $form['condition']['key'] == $cond_value) ? 'selected="selected"' : '';
-                                                        echo '<option value="' . $cond_value . '" ' . $is_selected . '>' . $cond_title . '</option>';
+                                                        echo '<option value="' . esc_attr($cond_value) . '" ' . esc_attr($is_selected) . '>' . esc_html($cond_title) . '</option>';
                                                     }
 
@@ -975 +1090 @@
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Pages', 'pinpointe'); ?></th>
-                                            <td><select multiple id="pinpointe_forms_condition_pages_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][condition_pages][]" class="pinpointe-field form_condition_value form_condition_value_pages form_condition_value_pages_not">
+                                            <th scope="row"><?php esc_html_e('Pages', 'pinpointe'); ?></th>
+                                            <td><select multiple id="pinpointe_forms_condition_pages_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][condition_pages][]" class="pinpointe-field form_condition_value form_condition_value_pages form_condition_value_pages_not">
 
                                                 <?php
                                                     foreach ($pages as $key => $name) {
                                                         $is_selected = (is_array($form['condition']) && isset($form['condition']['key']) && in_array($form['condition']['key'], array('pages', 'pages_not')) && isset($form['condition']['value']) && is_array($form['condition']['value']) && in_array($key, $form['condition']['value'])) ? 'selected="selected"' : '';
-                                                        echo '<option value="' . $key . '" ' . $is_selected . '>' . $name . '</option>';
+                                                        echo '<option value="' . esc_attr($key) . '" ' . esc_attr($is_selected) . '>' . esc_html($name) . '</option>';
                                                     }
                                                 ?>
@@ -988 +1103 @@
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Posts', 'pinpointe'); ?></th>
-                                            <td><select multiple id="pinpointe_forms_condition_posts_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][condition_posts][]" class="pinpointe-field form_condition_value form_condition_value_posts form_condition_value_posts_not">
+                                            <th scope="row"><?php esc_html_e('Posts', 'pinpointe'); ?></th>
+                                            <td><select multiple id="pinpointe_forms_condition_posts_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][condition_posts][]" class="pinpointe-field form_condition_value form_condition_value_posts form_condition_value_posts_not">
 
                                                 <?php
                                                     foreach ($posts as $key => $name) {
                                                         $is_selected = (is_array($form['condition']) && isset($form['condition']['key']) && in_array($form['condition']['key'], array('posts', 'posts_not')) && isset($form['condition']['value']) && is_array($form['condition']['value']) && in_array($key, $form['condition']['value'])) ? 'selected="selected"' : '';
-                                                        echo '<option value="' . $key . '" ' . $is_selected . '>' . $name . '</option>';
+                                                        echo '<option value="' . esc_attr($key) . '" ' . esc_attr($is_selected) . '>' . esc_html($name) . '</option>';
                                                     }
                                                 ?>
@@ -1001 +1116 @@
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('Post categories', 'pinpointe'); ?></th>
-                                            <td><select multiple id="pinpointe_forms_condition_categories_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][condition_categories][]" class="pinpointe-field form_condition_value form_condition_value_categories form_condition_value_categories_not">
+                                            <th scope="row"><?php esc_html_e('Post categories', 'pinpointe'); ?></th>
+                                            <td><select multiple id="pinpointe_forms_condition_categories_<?php echo esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][condition_categories][]" class="pinpointe-field form_condition_value form_condition_value_categories form_condition_value_categories_not">
 
                                                 <?php
                                                     foreach ($post_categories as $key => $name) {
                                                         $is_selected = (is_array($form['condition']) && isset($form['condition']['key']) && in_array($form['condition']['key'], array('categories', 'categories_not')) && isset($form['condition']['value']) && is_array($form['condition']['value']) && in_array($key, $form['condition']['value'])) ? 'selected="selected"' : '';
-                                                        echo '<option value="' . $key . '" ' . $is_selected . '>' . $name . '</option>';
+                                                        echo '<option value="' . esc_attr($key) . '" ' . esc_attr($is_selected) . '>' . esc_html($name) . '</option>';
                                                     }
                                                 ?>
@@ -1014 +1129 @@
                                         </tr>
                                         <tr valign="top">
-                                            <th scope="row"><?php _e('URL fragment', 'pinpointe'); ?></th>
-                                            <td><input type="text" id="pinpointe_forms_condition_url_<?php echo $form_key; ?>" name="pinpointe_options[forms][<?php echo $form_key; ?>][condition_url]" value="<?php echo ((isset($form['condition']['key']) && in_array($form['condition']['key'], array('url', 'url_not')) && isset($form['condition']['value'])) ? $form['condition']['value'] : ''); ?>" class="pinpointe-field form_condition_value form_condition_value_url form_condition_value_url_not"></td>
+                                            <th scope="row"><?php esc_html_e('URL fragment', 'pinpointe'); ?></th>
+                                            <td><input type="text" id="pinpointe_forms_condition_url_<?php echo
+                                                esc_attr($form_key); ?>" name="pinpointe_options[forms][<?php echo esc_attr($form_key); ?>][condition_url]" value="<?php echo ((isset($form['condition']['key']) && in_array($form['condition']['key'], array('url', 'url_not')) && isset($form['condition']['value'])) ? esc_attr($form['condition']['value']) : ''); ?>" class="pinpointe-field form_condition_value form_condition_value_url form_condition_value_url_not"></td>
                                         </tr>
                                     </tbody></table>
@@ -1027 +1143 @@
                         </div>
                         <div>
-                            <button type="button" name="pinpointe_add_set" id="pinpointe_add_set" disabled="disabled" class="button button-primary" value="<?php _e('Add Form', 'pinpointe'); ?>" title="<?php _e('Still connecting to Pinpointe...', 'pinpointe'); ?>"><i class="fa fa-plus">&nbsp;&nbsp;<?php _e('Add Form', 'pinpointe'); ?></i></button>
+                            <button type="button" name="pinpointe_add_set" id="pinpointe_add_set" disabled="disabled" class="button button-primary" value="<?php esc_html_e('Add Form', 'pinpointe'); ?>" title="<?php esc_html_e('Still connecting to Pinpointe...', 'pinpointe'); ?>"><i class="fa fa-plus">&nbsp;&nbsp;<?php esc_html_e('Add Form', 'pinpointe'); ?></i></button>
                             <div style="clear: both;"></div>
                         </div>
@@ -1038 +1154 @@
             else if ($section['id'] == 'help_display') {
                 echo '<div class="pinpointe-section-info"><p style="line-height: 160%;">'
-                   . __('You can create multiple newsletter signup forms on the "Forms" page. Each can be displayed in one of the following ways:', 'pinpointe')
+                   . esc_html__('You can create multiple newsletter signup forms on the "Forms" page. Each can be displayed in one of the following ways:', 'pinpointe')
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('Widget', 'pinpointe') . '</strong><br />'
-                   . sprintf(__('Display any form on a sidebar of your choice by using a standard WordPress Widget. Go to the <a href="%s">Widgets page</a> and use the one named Pinpointe Signup. You can add as many instances of this widget as you like. You can optionally specify a comma-separated list of form IDs to limit which forms can be displayed on that particular spot.', 'pinpointe'), admin_url('/widgets.php'))
+                   . '<strong style="color:#222;">' . esc_html__('Widget', 'pinpointe') . '</strong><br />'
+                   . sprintf(esc_html__('Display any form on a sidebar of your choice by using a standard WordPress Widget. Go to the <a href="%s">Widgets page</a> and use the one named Pinpointe Signup. You can add as many instances of this widget as you like. You can optionally specify a comma-separated list of form IDs to limit which forms can be displayed on that particular spot.', 'pinpointe'), esc_url(admin_url('/widgets.php')))
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('Shortcode', 'pinpointe') . ' <code>[pinpointe_form]</code></strong><br />'
-                   . __('Insert a form into individual posts or pages by placing a shortcode anywhere in the content. You can limit which forms are eligible to be displayed here by specifying <code>forms</code> with a comma-separated list of form IDs, e.g. <code>[pinpointe_form forms="1,3,4"]</code>. A single form will be chosen from the list of form IDs.', 'pinpointe')
+                   . '<strong style="color:#222;">' . esc_html__('Shortcode', 'pinpointe') . ' <code>[pinpointe_form]</code></strong><br />'
+                   . esc_html__('Insert a form into individual posts or pages by placing a shortcode anywhere in the content. You can limit which forms are eligible to be displayed here by specifying <code>forms</code> with a comma-separated list of form IDs, e.g. <code>[pinpointe_form forms="1,3,4"]</code>. A single form will be chosen from the list of form IDs.', 'pinpointe')
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('Function', 'pinpointe') . ' <code>pinpointe_form()</code></strong><br />'
-                   . __('To display a form in nonstandard parts of your website, take advantage of the PHP function <code>pinpointe_form()</code>. To limit which forms can be displayed at that particular spot, pass a list of allowed form IDs in an array, e.g. <code>pinpointe_form(array(\'1\', \'3\', \'4\'))</code>', 'pinpointe')
+                   . '<strong style="color:#222;">' . esc_html__('Function', 'pinpointe') . ' <code>pinpointe_form()</code></strong><br />'
+                   . esc_html__('To display a form in nonstandard parts of your website, take advantage of the PHP function <code>pinpointe_form()</code>. To limit which forms can be displayed at that particular spot, pass a list of allowed form IDs in an array, e.g. <code>pinpointe_form(array(\'1\', \'3\', \'4\'))</code>', 'pinpointe')
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('Popup', 'pinpointe') . '</strong><br />'
-                   . sprintf(__('Increase the signup rate by displaying one of your signup forms in a <a href="%s">popup</a>. If you wish popup to be opened on click and not automatically on page load, simply assign ID <code>pinpointe_popup_open</code> to the element that you want to bind it to.', 'pinpointe'), admin_url('/options-general.php?page=pinpointe&tab=popup'))
+                   . '<strong style="color:#222;">' . esc_html__('Popup', 'pinpointe') . '</strong><br />'
+                   . sprintf(esc_html__('Increase the signup rate by displaying one of your signup forms in a <a href="%s">popup</a>. If you wish popup to be opened on click and not automatically on page load, simply assign ID <code>pinpointe_popup_open</code> to the element that you want to bind it to.', 'pinpointe'), esc_url(admin_url('/options-general.php?page=pinpointe&tab=popup')))
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('Under Post Content', 'pinpointe') . '</strong><br />'
-                   . sprintf(__('You can easily configure this plugin to display signup forms under each <a href="%s">post</a> that you publish. You can exclude (or include only particular posts) by setting appropriate form displaying conditions.', 'pinpointe'), admin_url('/options-general.php?page=pinpointe&tab=below'))
+                   . '<strong style="color:#222;">' . esc_html__('Under Post Content', 'pinpointe') . '</strong><br />'
+                   . sprintf(esc_html__('You can easily configure this plugin to display signup forms under each <a href="%s">post</a> that you publish. You can exclude (or include only particular posts) by setting appropriate form displaying conditions.', 'pinpointe'), esc_url(admin_url('/options-general.php?page=pinpointe&tab=below')))
                    . '</p><p style="line-height: 160%;">'
-                   . '<strong style="color:#222;">' . __('As Content Lock', 'pinpointe') . '</strong><br />'
-                   . sprintf(__('If you have valuable content that your visitors are after, you may wish to <a href="%s">lock</a> some of it so only visitors who subscribe to your mailing list can access it.', 'pinpointe'), admin_url('/options-general.php?page=pinpointe&tab=lock'))
+                   . '<strong style="color:#222;">' . esc_html__('As Content Lock', 'pinpointe') . '</strong><br />'
+                   . sprintf(esc_html__('If you have valuable content that your visitors are after, you may wish to <a href="%s">lock</a> some of it so only visitors who subscribe to your mailing list can access it.', 'pinpointe'), esc_url(admin_url('/options-general.php?page=pinpointe&tab=lock')))
                    . '</p></div>';
             }
             else if ($section['id'] == 'help_contact') {
                 echo '<div class="pinpointe-section-info"><p>'
-                   . sprintf(__('If you\'ve got any questions, feel free to contact us at <a href="mailto:%s">%s</a>.', 'pinpointe'), '[email protected]', '[email protected]')
+                   . sprintf(esc_html__('If you\'ve got any questions, feel free to contact us at <a href="mailto:%s">%s</a>.', 'pinpointe'), '[email protected]', '[email protected]')
                    . '</p><p>'
                    . '</p></div>';
@@ -1079 +1195 @@
             printf(
                 '<input type="text" id="%s" name="pinpointe_options[%s]" value="%s" class="pinpointe-field" />',
-                $args['name'],
-                $args['name'],
-                $args['options'][$args['name']]
+                esc_attr($args['name']),
+                esc_attr($args['name']),
+                esc_attr($args['options'][$args['name']])
             );
         }
@@ -1096 +1212 @@
             printf(
                 '<textarea id="%s" name="pinpointe_options[%s]" class="pinpointe-textarea">%s</textarea>',
-                $args['name'],
-                $args['name'],
-                $args['options'][$args['name']]
+                esc_attr($args['name']),
+                esc_attr($args['name']),
+                esc_html($args['options'][$args['name']])
             );
         }
@@ -1113 +1229 @@
             printf(
                 '<input type="checkbox" id="%s" name="pinpointe_options[%s]" value="1" %s />',
-                $args['name'],
-                $args['name'],
+                esc_attr($args['name']),
+                esc_attr($args['name']),
                 checked($args['options'][$args['name']], true, false)
             );
@@ -1142 +1258 @@
                 printf(
                     '<input type="checkbox" id="%s_%s" name="pinpointe_options[%s][]" value="%s" %s />',
-                    $args['name'],
-                    $key,
-                    $args['name'],
-                    $key,
+                    esc_attr($args['name']),
+                    esc_attr($key),
+                    esc_attr($args['name']),
+                    esc_attr($key),
                     checked($is_checked, true, false)
                 );
 
-                echo $name . '</li>';
+                echo esc_html($name) . '</li>';
             }
 
@@ -1166 +1282 @@
             printf(
                 '<select id="%s" name="pinpointe_options[%s]" class="pinpointe-field">',
-                $args['name'],
-                $args['name']
+                esc_attr($args['name']),
+                esc_attr($args['name']),
             );
 
@@ -1173 +1289 @@
                 printf(
                     '<option value="%s" %s>%s</option>',
-                    $key,
+                    esc_attr($key),
                     selected($key, $args['options'][$args['name']], false),
-                    $name
+                    esc_html($name)
                 );
             }
@@ -1193 +1309 @@
             printf(
                 '<select multiple id="%s" name="pinpointe_options[%s][]" class="pinpointe-field">',
-                $args['name'],
-                $args['name']
+                esc_attr($args['name']),
+                esc_attr($args['name'])
             );
 
@@ -1200 +1316 @@
                 printf(
                     '<option value="%s" %s>%s</option>',
-                    $key,
+                    esc_attr($key),
                     (in_array($key, $args['options'][$args['name']]) ? 'selected="selected"' : ''),
-                    $name
+                    esc_html($name)
                 );
             }
@@ -1220 +1336 @@
             printf(
                 '<input type="password" id="%s" name="pinpointe_options[%s]" value="%s" class="pinpointe-field" />',
-                $args['name'],
-                $args['name'],
-                $args['options'][$args['name']]
+                esc_attr($args['name']),
+                esc_attr($args['name']),
+                esc_attr($args['options'][$args['name']])
             );
         }
@@ -1272 +1388 @@
                         $new_forms[$form_number]['send_confirmation'] = (isset($form['send_confirmation']) && !empty($form['send_confirmation'])) ? $form['send_confirmation']: '';
 
+                        // overide_confirmation
+                        $new_forms[$form_number]['overide_confirmation'] = (isset($form['overide_confirmation']) && !empty($form['overide_confirmation'])) ? $form['overide_confirmation']: '';
+
+                        // html_confirmation_email
+                        if (isset($form['html_confirmation_email']) && !empty($form['html_confirmation_email'])) {
+                            $shortcode_validation_errors = $this->validateShortcodes($form['html_confirmation_email']);
+                            if (!empty($shortcode_validation_errors)) {
+                                foreach($shortcode_validation_errors as $error){
+                                    array_push($errors, array('setting' => 'html_confirmation_email', 'custom' => __($error, 'pinpointe')));
+                                }
+                                $form['html_confirmation_email'] = '';
+                            }
+                            $new_forms[$form_number]['html_confirmation_email'] = $form['html_confirmation_email'];
+                        }
+
                         // List
                         $new_forms[$form_number]['list'] = (isset($form['list_field']) && !empty($form['list_field'])) ? $form['list_field']: '';
 
                         // Tag
-                        $new_forms[$form_number]['tag'] = (isset($form['tag_field']) && !empty($form['tag_field'])) ? $form['tag_field']: '';
+                        $new_forms[$form_number]['tags'] = (isset($form['tag_field']) && !empty($form['tag_field'])) ? $form['tag_field']: '';
+
+                        // Show Mailing list
+                        $new_forms[$form_number]['show_mailing_list'] = (isset($form['show_mailing_list']) && !empty($form['show_mailing_list'])) ? $form['show_mailing_list'] : 'off';
+
+                        $this->saveTagMetadata($form_number, $new_forms[$form_number]['show_mailing_list'], $new_forms[$form_number]['tags']);
 
                         // Groups
@@ -1396 +1532 @@
                     }
                 }
-
                 $output['forms'] = $new_forms;
             }
@@ -1436 +1571 @@
                         // Validate boolean values (actually 1 and 0)
                         case 'bool':
-                            $input[$field] = $input[$field] == '' ? '0' : $input[$field];
+                            $input[$field] = !isset($input[$field]) || $input[$field] == '' ? '0' : $input[$field];
                             if (in_array($input[$field], array('0', '1')) || ($input[$field] == '' && $allow_empty)) {
                                 $output[$field] = $input[$field];
@@ -1501 +1636 @@
                             }
                             else {
-                                if (is_array($input[$field]) && !empty($input[$field])) {
+                                if (isset($input[$field]) && is_array($input[$field]) && !empty($input[$field])) {
                                     $temporary_output = array();
 
@@ -1611 +1746 @@
             // Display errors
             foreach ($errors as $error) {
-
-                $message = (!isset($error['custom']) ? $messages[$error['code']] : $error['custom']) . '. ' . __('Reverted to a previous state.', 'pinpointe');
-
-                add_settings_error(
-                    'pinpointe_settings_updated',
-                    //$error['setting'],
-                    $error['code'],
-                    __('Value of', 'pinpointe') . ' "' . $this->titles[$error['setting']] . '" ' . $message
-                );
+                $message = (!isset($error['custom']) ? $messages[$error['code']] : $error['custom']) . '. ' . __('Reverted to a previous state.', 'pinpointe');
+                $setting = $error['setting'];
+                
+                if (array_key_exists($error['setting'], $this->titles) && isset($this->titles[$error['setting']])) {
+                    $setting = $this->titles[$error['setting']];
+                }
+                
+                
+                $code = array_key_exists('code', $error) && isset($error['code'])
+                    ? $error['code']
+                    : $error['custom'];
+                
+                add_settings_error(
+                    'pinpointe_settings_updated',
+                    $code,
+                    __('Value of', 'pinpointe') . ' "' . $setting . '" ' . $message
+                );
             }
 
@@ -1625 +1768 @@
         }
 
+        /**
+         * Save tag metadata to the database as a `pinpointe_tags_metadata` option
+         *
+         * @param int $form_id The ID of the form.
+         * @param array $tag_ids An array of tag IDs to associate with the form.
+         * @param bool $show_mailing_list Whether to show the mailing list for the form.
+         *
+         * @throws \Exception If options cannot be saved || tag_ids is empty 
+         */
+        public function saveTagMetadata($form_id, $show_mailing_list, $tag_ids = [])
+        {
+            if(empty($tag_ids)){
+                throw new \Exception("Warning Tag Metadata: Cannot attempt to save empty tag_ids");
+            }
+            // Get all available  (from API)
+            $all_tags = $this->get_tags();
+
+            // select only the tags that are specified in $tag_ids
+            // we are doing this so that we store only valid tags (tags from API)
+            $tags = array_intersect_key($all_tags, array_flip($tag_ids));
+
+            // get the saved tag_metatada
+            $existing_metadata = $this->get_tag_metadata();
+            
+            if (empty($existing_metadata)) {
+                $existing_metadata[] = [
+                    'form_id' => $form_id,
+                    'tags' => wp_json_encode($tags),
+                    'show_mailing_list' => $show_mailing_list,
+                    'hash' => md5(time())
+                ];
+            } else {
+                $is_form_id_found = false;
+                
+                // loop through $existing_metadata to update or add new entry
+                // take note we are modifying the &$existing_metadata if form_id has been is_form_id_found
+                foreach ($existing_metadata as &$metadata) {
+                    if ($metadata['form_id'] == $form_id) {
+                        $metadata['tags'] = wp_json_encode($tags);
+                        $metadata['show_mailing_list'] = $show_mailing_list;
+                        $metadata['hash'] = md5(time());
+                        
+                        $is_form_id_found = true;
+                        break; // exit the loop once we've modified the form_id's metadata
+                    }
+                }
+                
+                unset($metadata); // unset the reference - cause we were modifying it and we are done
+                
+                // If metadata for the form_id doesn't exist, create a new entry
+                if (!$is_form_id_found) {
+                    $new_metadata = [
+                        'form_id' => $form_id,
+                        'tags' => wp_json_encode($tags),
+                        'show_mailing_list' => $show_mailing_list,
+                        'hash' => md5(time())
+                    ];
+                    $existing_metadata[] = $new_metadata;
+                }
+            }
+            
+            $status = update_option('pinpointe_tags_metadata', $existing_metadata);
+
+            if (!$status) {
+                throw new \Exception("Tag Metadata, Options: Could not save the tag metadata for some reason - E241");
+            }
+        }
+
+        /**
+         * Get tag metadata for a specific form or all forms.
+         *
+         * @param int|null $form_id The ID of the form. If null, retrieves metadata for all forms.
+         *
+         * @return array An array of tag metadata for the specified form or all forms.
+         */
+        public function get_tag_metadata($form_id = null)
+        {
+            $results = get_option('pinpointe_tags_metadata');
+
+            // Check if a specific form ID is provided and if its metadata exists
+            if ($form_id !== null && isset($results[$form_id])) {
+              return $results[$form_id];
+            } 
+
+            return $results ? $results : [];
+        }
+
+
+        /**
+         * Custom validation for shortcodes in the html email content
+         *
+         * @access public
+         * @param string $key
+         * @return mixed
+         */
+        public  function validateShortcodes($content)
+        {
+            $errors = [];
+            /**
+             * Shortcodes to check for existence.
+             *
+             * @var string[]
+             */
+            $shortcodes_to_check = array(
+                'pinpointe_powered_by',
+                'pinpointe_email_sent_to',
+                'pinpointe_confirm_link',
+                'pinpointe_confirm_link_href',
+            );
+
+            foreach($shortcodes_to_check as $shortcode) {
+                $shortcode_pattern = '/' . preg_quote('[' . $shortcode, '/') . '/';
+                if (!preg_match($shortcode_pattern, $content)) {
+                    $errors[] =  ' missing '.$shortcode.'  in the confirmation email content';
+                }
+            }
+            return $errors;
+        }
         /**
          * Custom validation for service provider API key
@@ -1876 +2137 @@
             // Check if we have something pre-selected
             if (!empty($data)) {
-                // Get merge vars
-                $merge = $this->get_merge_vars($lists);
 
                 $lists_to_get = array();
@@ -1885 +2144 @@
                     $lists_to_get[] = $form['list'];
                 }
-
-                $groups = $this->get_groups($lists_to_get);
-            }
-
-            echo json_encode(array('message' => array('lists' => $lists, 'groups' => $groups, 'merge' => $merge)));
+                
+                // Get merge vars
+                // only fetch merge_vars with lists in lists_to_get instead of every list.
+                $merge = $this->get_merge_vars(array_intersect_key($lists, array_flip($lists_to_get)));
+
+            }
+
+            echo json_encode(array('message' => array('lists' => $lists, 'groups' => null, 'merge' => $merge)));
             die();
         }
@@ -1970 +2232 @@
                 }
 
-                $results = array('' => '');
+                $results = [];
 
                 foreach ($tags as $tag) {
-                    $results[$tag['tagid']] = $tag['name'];
+                    $tagInfo = array(
+                        'name' => $tag['name'],
+                        'description' => isset($tag['description']) || !empty($tag['description']) ? $tag['description'] : 'Default description for ' . $tag['name']
+                    );
+                    
+                    if (isset($tag['tagid'])) { // for xml api
+                        $results[$tag['tagid']] = $tagInfo;
+                    } else { // for json api
+                        $results[$tag['id']] = $tagInfo;
+                    }
+                
                 }
 
@@ -2121 +2393 @@
             // Check if we have received required data
             if (isset($_POST['data']) && isset($_POST['data']['list'])) {
-                $groups = $this->get_groups($_POST['data']['list']);
                 $merge_vars = $this->get_merge_vars(array($_POST['data']['list'] => ''));
             }
             else {
-                $groups = array('' => '');
                 $merge_vars = array('' => '');
             }
 
-            echo json_encode(array('message' => array('groups' => $groups, 'merge' => $merge_vars)));
+            echo json_encode(array('message' => array('groups' => ['' => ''], 'merge' => $merge_vars)));
             die();
         }
@@ -2248 +2518 @@
         {
             if (!$this->load_pinpointe()) {
-                $message = '<h4 style="margin:0px;"><i class="fa fa-check" style="font-size: 1.5em; color: green;"></i>&nbsp;&nbsp;&nbsp;' . __('Pinpointe credentials could not be set', 'pinpointe') . ' ' . $account_info['username'] . '</h4>';
+                $message = '<h4 style="margin:0px;"><i class="fa fa-check" style="font-size: 1.5em; color: green;"></i>&nbsp;&nbsp;&nbsp;' . __('Pinpointe credentials could not be set', 'pinpointe') .  '</h4>';
             }
             else if ( ($msg = $this->test_pinpointe()) !== true) {
@@ -2588 +2858 @@
             require_once PINPOINTE_PLUGIN_PATH . '/includes/pinpointe-prepare-form.inc.php';
 
-            $form_html = pinpointe_prepare_form($form, $this->opt, 'after_posts', $args);
+            $form_html = pinpointe_prepare_form($form, $this->opt, 'after_posts');
 
             return $content . $form_html;
+        }
+
+        /**
+         * Form shortcode handler
+         *
+         * @access public
+         * @param mixed $attributes
+         * @return void
+         */
+        public function powered_by_shortcode($attributes)
+        {
+            return '<strong>Email marketing powered by <a style="display: inline-block; text-decoration: none; font-family: Helvetica, Arial, sans-serif; color: #262f57;" href="https://www.pinpointe.com/">Pinpointe</a></strong>';
+        }
+
+        /**
+         * Form shortcode handler
+         *
+         * @access public
+         * @param mixed $attributes
+         * @return void
+         */
+        public function email_sent_to_shortcode($attributes)
+        {
+            return '<small style="font-size: 86%; font-weight: normal;">This email was sent to <a style="display: inline-block; text-decoration: none; font-family: Helvetica, Arial, sans-serif; color: #7a7a7a;" href="mailto:%%emailaddress%%">%%emailaddress%%</a>.</small>';
+        }
+
+        /**
+         * Form shortcode handler
+         *
+         * @access public
+         * @param mixed $attributes
+         * @return void
+         */
+        public function confirm_link_shortcode($attributes)
+        {
+            return '<small style="font-size: 86%; font-weight: normal;">If the above link does not work, copy and paste the following link into your browser:<br/><a style="display: inline-block; text-decoration: none; font-family: Helvetica, Arial, sans-serif; color: #262f57;" href="%%CONFIRMLINK%%">%%CONFIRMLINK%%</a></small>';
+        }
+
+        /**
+         * Form shortcode handler
+         *
+         * @access public
+         * @param mixed $attributes
+         * @return void
+         */
+        public function confirm_link_href_shortcode($attributes)
+        {
+            return '%%CONFIRMLINK%%';
         }
 
@@ -2658 +2976 @@
          * @return mixed
          */
-        public function subscribe($list_id, $email, $groups, $custom_fields, $is_backend = false, $tag_id = 0, $send_confirmation = false)
+        public function subscribe($list_id, $email, $groups, $custom_fields, $is_backend = false, $tags = [], $send_confirmation = false, $custom_data = [] )
         {
             // Load Pinpointe
@@ -2714 +3032 @@
                     $this->opt['pinpointe_add_to_autoresponders'],
                     $this->opt['pinpointe_update_existing'],
-                    $tag_id,
-                    $send_confirmation
+                    $tags,
+                    $send_confirmation,
+                    $custom_data
                 );
 
@@ -2965 +3284 @@
                         $date_format = self::get_date_pattern('date', $this->opt['pinpointe_date_format'], 'date_format');
 
-                        // Parse to array with date details (using strptime to support PHP 5.2)
-                        $date_parsed = strptime($data['custom'][$field['tag']], $date_format);
+                        if (version_compare(phpversion(), '7.2.0', '>=')){
+                            $date_parsed = date_parse_from_format($date_format, $data['custom'][$field['tag']]);
+                        }
+                        else{
+                            // Parse to array with date details (using strptime to support PHP 5.2)
+                            $date_parsed = strptime($data['custom'][$field['tag']], $date_format);
+                        }
+
+                        $date_parsed = date_parse_from_format($date_format, $data['custom'][$field['tag']]);
 
                         if (!$date_parsed) {
@@ -3049 +3375 @@
             }
 
+            $custom_data = [
+                'html_confirmation_email' => $form['send_confirmation'] && !empty($form['html_confirmation_email']) && $form['overide_confirmation'] ? do_shortcode($form['html_confirmation_email']) : null,
+            ];
+
+            $tags = isset($data['custom']['selected_tags']) ? $data['custom']['selected_tags'] : $form['tags'];
             // Subscribe user
-            $subscribe_result = $this->subscribe($form['list'], $email, $subscribe_groups, $custom_fields, false, $form['tag'], $form['send_confirmation']);
+            $subscribe_result = $this->subscribe(
+                $form['list'],
+                    $email,
+                    $subscribe_groups,
+                    $custom_fields,
+                    false,
+                    $tags,
+                    $form['send_confirmation'],
+                    $custom_data
+            );
+
 
             if (is_bool($subscribe_result)) {
@@ -3785 +4126 @@
                             setTimeout(function() {
                                 pinpointe_open_popup();
-                            }, <?php echo ($this->opt['pinpointe_popup_delay'] != '' ? ($this->opt['pinpointe_popup_delay'] * 1000) : 1); ?>);
+                            }, <?php echo esc_js($this->opt['pinpointe_popup_delay'] != '' ? ($this->opt['pinpointe_popup_delay'] * 1000) : 1); ?>);
                         }
 
@@ -3794 +4135 @@
                             }
 
-                            form = jQuery('#pinpointe_popup_<?php echo $prepared_form_id; ?>');
+                            form = jQuery('#pinpointe_popup_<?php echo esc_attr($prepared_form_id); ?>');
 
                             jQuery('#sky-form-modal-overlay').fadeIn();
@@ -3814 +4155 @@
 
                             <?php if ($this->opt['pinpointe_popup_time_limit']): ?>
-                                var minutes = <?php echo $this->opt['pinpointe_popup_time_limit']; ?>;
+                                var minutes = <?php echo esc_html($this->opt['pinpointe_popup_time_limit']); ?>;
                                 pinpointe_write_cookie('pinpointe_t', '1', minutes);
                             <?php endif; ?>
@@ -3840 +4181 @@
             <?php
 
-            echo $form_html;
+            echo wp_kses_post($form_html);
         }
 
@@ -3936 +4277 @@
         public function render_checkbox($context)
         {
-            echo '<p style="margin: 2px 6px 16px 0px;"><label for="pinpointe_checkbox_signup"><input type="checkbox" id="pinpointe_checkbox_signup" name="pinpointe_checkbox_signup" value="1" ' . ($this->opt['pinpointe_checkbox_state'] == '1' ? 'checked="checked"' : '') . ' /> ' . $this->opt['pinpointe_checkbox_label'] . '</label></p>';
+            echo '<p style="margin: 2px 6px 16px 0px;"><label for="pinpointe_checkbox_signup"><input type="checkbox" id="pinpointe_checkbox_signup" name="pinpointe_checkbox_signup" value="1" ' . esc_attr($this->opt['pinpointe_checkbox_state'] == '1' ? 'checked="checked"' : '') . ' /> ' . esc_html($this->opt['pinpointe_checkbox_label']) . '</label></p>';
         }
 
@@ -3982 +4323 @@
 
             // Role
-            $merge['ROLE'] = array_shift(array_values($user->roles));
+            $array = array_values($user->roles);
+            $merge['ROLE'] = array_shift($array);
 
             // User name
@@ -4073 +4415 @@
 
             // Role
-            $merge['ROLE'] = array_shift(array_values($user->roles));
+            $array = array_values($user->roles);
+            $merge['ROLE'] = array_shift($array);
 
             // User name
@@ -4159 +4502 @@
 
             // Role
-            $role = array_shift(array_values($user->roles));
-            $role_old = array_shift(array_values($user_old->roles));
+            $roles = array_values($user->roles);
+            $role = array_shift($roles);
+            $old_roles = array_values($user_old->roles);
+            $role_old = array_shift($old_roles);
 
             if ($role != $role_old) {

pinpointe-form-integration/trunk/readme.txt

@@ -3 +3 @@
 Tags: email marketing, forms, popups, opt-in, mailing list, subscription
 Requires at least: 3.5
-Tested up to: 5.7
+Tested up to: 6.4.2
 Stable tag: 1.5
 Requires PHP: 5.4
@@ -49 +49 @@
 
 == Changelog ==
+1.6
+* Added ability to display multiple mailing lists on the subscription form
+* Added option to override default pinpointe confirmation email sent to the subscriber upon form submission
+* Fixed bugs related to PHP deprecations for PHP 8.0 and PHP 8.2
+* Tested with WordPress v6.4.2
+
 1.5
 * Fixed an issue where not passing a list (tag) would cause the updated Pinpointe API to detect an error with the XML structure