From 0ac47187361f4d57108ad3081ed55e316d1bf9cc Mon Sep 17 00:00:00 2001
From: polepalligayathridevi <gayathridevi.polepalli@sailthru.com>
Date: Fri, 23 Feb 2024 15:13:59 +0530
Subject: [PATCH 1/5] [INT-688_WORDPRESS_INTEGRATION_MISSING_FOR_PARAMETER]
 added for in the label and id in the email input field

---
 README.txt                         |  2 +-
 changelog.md                       |  3 +++
 plugin.php                         |  6 +++---
 views/widget.subscribe.display.php | 12 ++++++------
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/README.txt b/README.txt
index 6af6e65..21dd898 100644
--- a/README.txt
+++ b/README.txt
@@ -3,7 +3,7 @@ Contributors: sailthru-wp
 Tags: personalization, email,
 Requires at least: 5.5
 Tested up to: 5.7
-Stable tag: 4.3.1
+Stable tag: 4.3.2
 
 Provides an integration with Sailthru
 
diff --git a/changelog.md b/changelog.md
index bce557c..4e7d266 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## v4.3.2 (2024-02-23)
+Added for in label and id in input field
+
 ## v4.3.1 (2023-07-07)
 Added fix for ad-blocker
 
diff --git a/plugin.php b/plugin.php
index d6a9d56..39f325c 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,7 +3,7 @@
 Plugin Name:        Sailthru for WordPress
 Plugin URI:         http://sailthru.com/
 Description:        Add the power of Sailthru to your WordPress set up.
-Version:            4.3.1
+Version:            4.3.2
 Requires at least:  5.5
 Author:             Sailthru
 Author URI:         http://sailthru.com
@@ -36,7 +36,7 @@
  * @var   const    $version    The current version of the plugin.
  */
 if ( ! defined( 'SAILTHRU_PLUGIN_VERSION' ) ) {
-	define( 'SAILTHRU_PLUGIN_VERSION', '4.3.1' );
+	define( 'SAILTHRU_PLUGIN_VERSION', '4.3.2' );
 }
 
 if ( ! defined( 'SAILTHRU_PLUGIN_PATH' ) ) {
@@ -180,7 +180,7 @@ function sailthru_deactivate( $network_wide ) {
  */
 function sailthru_uninstall( $network_wide ) {
 	remove_options();
-} 
+}
 
 
 function remove_options() {
diff --git a/views/widget.subscribe.display.php b/views/widget.subscribe.display.php
index ba991d4..7646090 100644
--- a/views/widget.subscribe.display.php
+++ b/views/widget.subscribe.display.php
@@ -63,8 +63,8 @@
 				<div class="sailthru-add-subscriber-errors"></div>
 
 				<div class="sailthru_form_input form-group">
-					<label class="sailthru-widget-label">Email</label>
-					<input type="text" name="email" value="" class="form-control sailthru_email" />
+					<label class="sailthru-widget-label" for="st_wp_email">Email</label>
+					<input type="text" name="email" value="" class="form-control sailthru_email" id="st_wp_email" />
 				</div>
 
 				<?php
@@ -183,12 +183,12 @@
 									echo '</div>';
 								} elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
 									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-									
+
 									echo '<div class="checkbox">';
 									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
-									
+
 									foreach ( $items as $item ) {
-										
+
 										if ( ! empty( $item ) ) {
 											$vals = explode( ':', $item );
 
@@ -199,7 +199,7 @@
 											}
 
 
-											
+
 											echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
 										}
 									}

From b69c64007b872845532f67360ddc77c89979cb99 Mon Sep 17 00:00:00 2001
From: polepalligayathridevi <gayathridevi.polepalli@sailthru.com>
Date: Fri, 23 Feb 2024 17:34:25 +0530
Subject: [PATCH 2/5] [INT-688_WORDPRESS_INTEGRATION_MISSING_FOR_PARAMETER] fix
 the spacing issue

---
 plugin.php                         | 2 +-
 views/widget.subscribe.display.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugin.php b/plugin.php
index 39f325c..a53dfa0 100644
--- a/plugin.php
+++ b/plugin.php
@@ -180,7 +180,7 @@ function sailthru_deactivate( $network_wide ) {
  */
 function sailthru_uninstall( $network_wide ) {
 	remove_options();
-}
+} 
 
 
 function remove_options() {
diff --git a/views/widget.subscribe.display.php b/views/widget.subscribe.display.php
index 7646090..0bf6236 100644
--- a/views/widget.subscribe.display.php
+++ b/views/widget.subscribe.display.php
@@ -187,7 +187,7 @@
 									echo '<div class="checkbox">';
 									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-									foreach ( $items as $item ) {
+                                    foreach ( $items as $item ) {
 
 										if ( ! empty( $item ) ) {
 											$vals = explode( ':', $item );
@@ -200,7 +200,7 @@
 
 
 
-											echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+                                            echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
 										}
 									}
 									echo '</div>';

From 635b88b4b6287ad00cf0b826a0eabc52116b2d3c Mon Sep 17 00:00:00 2001
From: polepalligayathridevi <gayathridevi.polepalli@sailthru.com>
Date: Fri, 23 Feb 2024 17:48:30 +0530
Subject: [PATCH 3/5] [INT-688_WORDPRESS_INTEGRATION_MISSING_FOR_PARAMETER]
 removed white space

---
 plugin.php                         |   2 +-
 views/widget.subscribe.display.php | 560 ++++++++++++++---------------
 2 files changed, 281 insertions(+), 281 deletions(-)

diff --git a/plugin.php b/plugin.php
index a53dfa0..39f325c 100644
--- a/plugin.php
+++ b/plugin.php
@@ -180,7 +180,7 @@ function sailthru_deactivate( $network_wide ) {
  */
 function sailthru_uninstall( $network_wide ) {
 	remove_options();
-} 
+}
 
 
 function remove_options() {
diff --git a/views/widget.subscribe.display.php b/views/widget.subscribe.display.php
index 0bf6236..88a1a39 100644
--- a/views/widget.subscribe.display.php
+++ b/views/widget.subscribe.display.php
@@ -1,383 +1,383 @@
 <?php
-	/*
-	* Grab the settings from $instance and fill out default
-	* values as needed.
-	*/
-	$widget_id = $this->id;
-
-	$title         = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', esc_attr( $instance['title'] ) );
-	$source        = empty( $instance['source'] ) ? get_bloginfo( 'url' ) : esc_attr( $instance['source'] );
-	$lo_event_name = empty( $instance['lo_event_name'] ) ? '' : esc_attr( $instance['lo_event_name'] );
-	$reset_optout_status = empty( $instance['reset_optout_status'] ) ? '' : esc_attr( $instance['reset_optout_status'] );
-	$hide_title_status = empty( $instance['hide_title_status'] ) ? '' : esc_attr( $instance['hide_title_status'] );
-
-	if ( ! empty( $instance['sailthru_list'] ) ) {
-		if ( is_array( $instance['sailthru_list'] ) ) {
-			$sailthru_list = implode( ',', $instance['sailthru_list'] );
-		} else {
-			$sailthru_list = $instance['sailthru_list'];
-		}
-	} else {
-		$sailthru_list = '';
-	}
-
-	// display options
-	$customfields = get_option( 'sailthru_forms_options' );
-	$sailthru     = get_option( 'sailthru_setup_options' );
-	// nonce
-	$nonce = wp_create_nonce( 'add_subscriber_nonce' );
+/*
+* Grab the settings from $instance and fill out default
+* values as needed.
+*/
+$widget_id = $this->id;
+
+$title         = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', esc_attr( $instance['title'] ) );
+$source        = empty( $instance['source'] ) ? get_bloginfo( 'url' ) : esc_attr( $instance['source'] );
+$lo_event_name = empty( $instance['lo_event_name'] ) ? '' : esc_attr( $instance['lo_event_name'] );
+$reset_optout_status = empty( $instance['reset_optout_status'] ) ? '' : esc_attr( $instance['reset_optout_status'] );
+$hide_title_status = empty( $instance['hide_title_status'] ) ? '' : esc_attr( $instance['hide_title_status'] );
+
+if ( ! empty( $instance['sailthru_list'] ) ) {
+    if ( is_array( $instance['sailthru_list'] ) ) {
+        $sailthru_list = implode( ',', $instance['sailthru_list'] );
+    } else {
+        $sailthru_list = $instance['sailthru_list'];
+    }
+} else {
+    $sailthru_list = '';
+}
+
+// display options
+$customfields = get_option( 'sailthru_forms_options' );
+$sailthru     = get_option( 'sailthru_setup_options' );
+// nonce
+$nonce = wp_create_nonce( 'add_subscriber_nonce' );
 ?>
-	<div class="sailthru-signup-widget">
-		<span class="sailthru-signup-widget-close"><a href="#sailthru-signup-widget">Close</a></span>
-		<div class="sailthru_form">
-
-			<?php
-				// title
-				if ( ! empty( $title ) ) {
-					if ( ! isset( $before_title ) ) {
-						$before_title = '';
-					}
-					if ( ! isset( $after_title ) ) {
-						$after_title = '';
-					}
+<div class="sailthru-signup-widget">
+    <span class="sailthru-signup-widget-close"><a href="#sailthru-signup-widget">Close</a></span>
+    <div class="sailthru_form">
+
+        <?php
+        // title
+        if ( ! empty( $title ) ) {
+            if ( ! isset( $before_title ) ) {
+                $before_title = '';
+            }
+            if ( ! isset( $after_title ) ) {
+                $after_title = '';
+            }
 
-					if ( isset( $hide_title_status ) && $hide_title_status=="on") {
-						$before_title= substr($before_title, 0, -2) . " hide_toggle" . '">';
-					}
+            if ( isset( $hide_title_status ) && $hide_title_status=="on") {
+                $before_title= substr($before_title, 0, -2) . " hide_toggle" . '">';
+            }
 
-					echo  wp_kses_post( $before_title . trim( $title ) . $after_title );
-				}
+            echo  wp_kses_post( $before_title . trim( $title ) . $after_title );
+        }
 
-					// success message
-				if ( empty( $customfields['sailthru_customfield_success'] ) ) {
-					$success = 'Thank you for subscribing!';
-				} else {
-					$success = $customfields['sailthru_customfield_success'];
-				}
-			?>
+        // success message
+        if ( empty( $customfields['sailthru_customfield_success'] ) ) {
+            $success = 'Thank you for subscribing!';
+        } else {
+            $success = $customfields['sailthru_customfield_success'];
+        }
+        ?>
 
-			<div class="success" hidden="hidden"><?php echo esc_html( $success ); ?></div>
+        <div class="success" hidden="hidden"><?php echo esc_html( $success ); ?></div>
 
-			<form method="post" action="#" class="sailthru-add-subscriber-form" id="<?php echo esc_attr( $widget_id ) ?>">
+        <form method="post" action="#" class="sailthru-add-subscriber-form" id="<?php echo esc_attr( $widget_id ) ?>">
 
-				<div class="sailthru-add-subscriber-errors"></div>
+            <div class="sailthru-add-subscriber-errors"></div>
 
-				<div class="sailthru_form_input form-group">
-					<label class="sailthru-widget-label" for="st_wp_email">Email</label>
-					<input type="text" name="email" value="" class="form-control sailthru_email" id="st_wp_email" />
-				</div>
+            <div class="sailthru_form_input form-group">
+                <label class="sailthru-widget-label" for="st_wp_email">Email</label>
+                <input type="text" name="email" value="" class="form-control sailthru_email" id="st_wp_email"/>
+            </div>
 
-				<?php
+            <?php
 
 
-					$key = get_option( 'sailthru_forms_key' );
+            $key = get_option( 'sailthru_forms_key' );
 
 
-					// figure out display needs and order when using short code
-					if ( isset( $instance['using_shortcode'] ) && $instance['using_shortcode'] ) {
+            // figure out display needs and order when using short code
+            if ( isset( $instance['using_shortcode'] ) && $instance['using_shortcode'] ) {
 
-						if ( ! empty( $instance['fields'] ) ) {
-							$order  = '';
-							$fields = explode( ',', $instance['fields'] );
-							foreach ( $fields as $field ) {
-								$field         = trim( $field );
-								$name_stripped = preg_replace( '/[^\da-z]/i', '_', $field );
-								$instance[ 'show_' . $name_stripped . '_name' ]     = true;
-								$instance[ 'show_' . $name_stripped . '_required' ] = false;
-								for ( $i = 1; $i <= $key; $i++ ) {
-									if ( isset( $customfields[ $i ] ) ) {
-										$db_name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $i ]['sailthru_customfield_name'] );
+                if ( ! empty( $instance['fields'] ) ) {
+                    $order  = '';
+                    $fields = explode( ',', $instance['fields'] );
+                    foreach ( $fields as $field ) {
+                        $field         = trim( $field );
+                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $field );
+                        $instance[ 'show_' . $name_stripped . '_name' ]     = true;
+                        $instance[ 'show_' . $name_stripped . '_required' ] = false;
+                        for ( $i = 1; $i <= $key; $i++ ) {
+                            if ( isset( $customfields[ $i ] ) ) {
+                                $db_name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $i ]['sailthru_customfield_name'] );
 
-										if ( $name_stripped === $db_name_stripped ) {
-											$order .= $i . ',';
-											break;
-										}
-									}
-								}
-							}
-							$order_list = explode( ',', $order );
-						}
-					} else {
-						// figure out which fields we need to show when NOT using shortcodde
-						foreach ( $instance as $field ) {
+                                if ( $name_stripped === $db_name_stripped ) {
+                                    $order .= $i . ',';
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    $order_list = explode( ',', $order );
+                }
+            } else {
+                // figure out which fields we need to show when NOT using shortcodde
+                foreach ( $instance as $field ) {
 
-							if ( is_array( $field ) ) {
-								continue;
-							}
+                    if ( is_array( $field ) ) {
+                        continue;
+                    }
 
-							$name_stripped                                      = preg_replace( '/[^\da-z]/i', '_', $field );
-							$instance[ 'show_' . $name_stripped . '_name' ]     = true;
-							$instance[ 'show_' . $name_stripped . '_required' ] = false;
+                    $name_stripped                                      = preg_replace( '/[^\da-z]/i', '_', $field );
+                    $instance[ 'show_' . $name_stripped . '_name' ]     = true;
+                    $instance[ 'show_' . $name_stripped . '_required' ] = false;
 
-						} // end foreach
+                } // end foreach
 
-						// determine order of fields.
-						if ( empty( $order ) && isset( $instance['field_order'] ) ) {
-							$order = $instance['field_order'];
-						}
+                // determine order of fields.
+                if ( empty( $order ) && isset( $instance['field_order'] ) ) {
+                    $order = $instance['field_order'];
+                }
 
-						if ( empty( $order ) ) {
-							$order = get_option( 'sailthru_customfield_order' );
-						}
+                if ( empty( $order ) ) {
+                    $order = get_option( 'sailthru_customfield_order' );
+                }
 
 
-						if ( isset( $order ) && '' !== $order ) {
-							$order_list = explode( ',', $order );
-						}
-					}
+                if ( isset( $order ) && '' !== $order ) {
+                    $order_list = explode( ',', $order );
+                }
+            }
 
-					// widget is rendered using Appearance > Widget
-				if ( isset( $order_list ) ) {
+            // widget is rendered using Appearance > Widget
+            if ( isset( $order_list ) ) {
 
-					for ( $i = 0; $i < count( $order_list ); $i++ ) {
-						$field_key = (int) $order_list[ $i ];
+                for ( $i = 0; $i < count( $order_list ); $i++ ) {
+                    $field_key = (int) $order_list[ $i ];
 
-						if ( ! empty( $customfields[ $field_key ] ) ) {
-							$name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
+                    if ( ! empty( $customfields[ $field_key ] ) ) {
+                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
 
 
-							if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
+                        if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
 
-								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-								} else {
-									$attributes = '';
-								}
+                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+                            } else {
+                                $attributes = '';
+                            }
 
-								echo '<div class="sailthru_form_input form-group">';
+                            echo '<div class="sailthru_form_input form-group">';
 
-								if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                            if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
 
-									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
-									echo '<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
+                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                                echo '<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
 
-									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-									echo '<option value=""></option>';
-									foreach ( $items as $item ) {
-										if ( ! empty( $item ) ) {
-											$vals = explode( ':', $item );
-											echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( $vals[0] ) . '</option>';
-										}
-									}
+                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                                echo '<option value=""></option>';
+                                foreach ( $items as $item ) {
+                                    if ( ! empty( $item ) ) {
+                                        $vals = explode( ':', $item );
+                                        echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( $vals[0] ) . '</option>';
+                                    }
+                                }
 
-									echo '</select>';
+                                echo '</select>';
 
-								} elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                            } elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
 
-									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-									echo '<div class="radio">';
-									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                                echo '<div class="radio">';
+                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-									foreach ( $items as $item ) {
-										if ( ! empty( $item ) ) {
-											$vals = explode( ':', $item );
-											echo '<input ';
+                                foreach ( $items as $item ) {
+                                    if ( ! empty( $item ) ) {
+                                        $vals = explode( ':', $item );
+                                        echo '<input ';
 
-											if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-												echo 'required=required ';
-											}
-											echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '" ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
-										}
-									}
+                                        if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+                                            echo 'required=required ';
+                                        }
+                                        echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '" ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+                                    }
+                                }
 
-									echo '</div>';
-								} elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                                echo '</div>';
+                            } elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-									echo '<div class="checkbox">';
-									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                                echo '<div class="checkbox">';
+                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                    foreach ( $items as $item ) {
+                                foreach ( $items as $item ) {
 
-										if ( ! empty( $item ) ) {
-											$vals = explode( ':', $item );
+                                    if ( ! empty( $item ) ) {
+                                        $vals = explode( ':', $item );
 
-											echo '<input ';
+                                        echo '<input ';
 
-											if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-												echo 'required=required ';
-											}
+                                        if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+                                            echo 'required=required ';
+                                        }
 
 
 
-                                            echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
-										}
-									}
-									echo '</div>';
+                                        echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+                                    }
+                                }
+                                echo '</div>';
 
-								} else {
+                            } else {
 
-									//check if the field is required
-									if ( 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
+                                //check if the field is required
+                                if ( 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
 
-										echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                                    echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-										echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
+                                    echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
 
-										if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type']  ) {
-											echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-										}
+                                    if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type']  ) {
+                                        echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+                                    }
 
-										echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
+                                    echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
 
-									} else {
+                                } else {
 
-										echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                                    echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-										echo '<input ';
+                                    echo '<input ';
 
-										if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-											echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-										}
+                                    if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                                        echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+                                    }
 
-										echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
+                                    echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
 
-									}
-								}
+                                }
+                            }
 
-								echo '</div>'; // end of .sailthru_form_input .form-group
+                            echo '</div>'; // end of .sailthru_form_input .form-group
 
-							} //end if !empty name
-						} // end if !empty field key
-					}// end for loop
+                        } //end if !empty name
+                    } // end if !empty field key
+                }// end for loop
 
 
-					// widget is rendered using shortcode.
-					// $order is specified in the way the user listed the fields
-					// not by some saved fields_order
-				} else {
+                // widget is rendered using shortcode.
+                // $order is specified in the way the user listed the fields
+                // not by some saved fields_order
+            } else {
 
-					for ( $i = 0; $i < $key; $i++ ) {
-						$field_key = $i + 1;
+                for ( $i = 0; $i < $key; $i++ ) {
+                    $field_key = $i + 1;
 
 
-						if ( ! empty( $customfields[ $field_key ] ) ) {
-							$name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
+                    if ( ! empty( $customfields[ $field_key ] ) ) {
+                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
 
-							if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
+                        if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
 
-								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-								} else {
-									$attributes = '';
-								}
-							}
+                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+                            } else {
+                                $attributes = '';
+                            }
+                        }
 
-							echo '<div class="sailthru_form_input form-group">';
+                        echo '<div class="sailthru_form_input form-group">';
 
-							if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>
+                        if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>
 									<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
-								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-								foreach ( $items as $item ) {
-									$vals = explode( ':', $item );
-									echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( isset( $vals[0] ) ? $vals[0] : '' ) . '</option>';
-								}
+                            foreach ( $items as $item ) {
+                                $vals = explode( ':', $item );
+                                echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( isset( $vals[0] ) ? $vals[0] : '' ) . '</option>';
+                            }
 
-								echo '</select>';
-							} elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-								echo '<div class="radio">';
-								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                            echo '</select>';
+                        } elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                            echo '<div class="radio">';
+                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-								foreach ( $items as $item ) {
-									$vals = explode( ':', $item );
-									echo '<input ';
+                            foreach ( $items as $item ) {
+                                $vals = explode( ':', $item );
+                                echo '<input ';
 
-									if ('checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-										echo 'required=required ';
-									}
+                                if ('checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+                                    echo 'required=required ';
+                                }
 
-									echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
-								}
+                                echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
+                            }
 
-								echo '</div>';
-							} elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+                            echo '</div>';
+                        } elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-								echo '<div class="checkbox">';
-								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+                            echo '<div class="checkbox">';
+                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-								foreach ( $items as $item ) {
-									$vals = explode( ':', $item );
-									echo '<input ';
+                            foreach ( $items as $item ) {
+                                $vals = explode( ':', $item );
+                                echo '<input ';
 
-									if ( isset( $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) && 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ]  ) {
-										echo 'required=required ';
-									}
+                                if ( isset( $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) && 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ]  ) {
+                                    echo 'required=required ';
+                                }
 
-									echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
-								}
+                                echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
+                            }
 
-								echo '</div>';
-							} else {
+                            echo '</div>';
+                        } else {
 
-								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-								} else {
-									$attributes = '';
-								}
+                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+                            } else {
+                                $attributes = '';
+                            }
 
-								//check if the field is required
-								if ( isset( $instance[ 'show_' . $name_stripped . '_required' ] ) && 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
+                            //check if the field is required
+                            if ( isset( $instance[ 'show_' . $name_stripped . '_required' ] ) && 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
 
-									echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
+                                echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
 
-									if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-										echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-									}
+                                if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                                    echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+                                }
 
-									echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
+                                echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
 
-								} else {
+                            } else {
 
-									echo '<input ';
+                                echo '<input ';
 
-									if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-										echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-									}
+                                if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+                                    echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+                                }
 
-									echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
+                                echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
 
-								}
-							}
+                            }
+                        }
 
-							echo '</div>'; // end .sailthru_form_input .form-group
+                        echo '</div>'; // end .sailthru_form_input .form-group
 
-						} //end if !empty name
-					} // end for
-				} // end if there are fields
-				?>
+                    } //end if !empty name
+                } // end for
+            } // end if there are fields
+            ?>
 
-				<?php
-					if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
-						echo '<p class="captcha-disclaimer">
+            <?php
+            if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
+                echo '<p class="captcha-disclaimer">
 						This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and
 						<a href="https://policies.google.com/terms">Terms of Service</a> apply.
 						</p>';
-					}
-				?>
-				<input type="hidden" name="sailthru_nonce" value="<?php echo esc_attr( $nonce) ; ?>" />
-				<input type="hidden" name="sailthru_email_list" value="<?php echo esc_attr( $sailthru_list ); ?>" />
-				<input type="hidden" name="action" value="add_subscriber" />
-				<input type="hidden" name="source" value="<?php echo esc_attr( $source ); ?>" />
-				<input type="hidden" name="lo_event_name" value="<?php echo esc_attr( $lo_event_name ); ?>" />
-				<input type="hidden" name="reset_optout_status" value="<?php echo esc_attr( $reset_optout_status ) ?>" />
-				<input type="hidden" name="hide_title_status" value="<?php echo esc_attr( $hide_title_status ) ?>" />
-				<input type="hidden" name="site_key" value="<?php echo esc_attr( $sailthru['google_recaptcha_site_key'] ) ?>" id="siteKey" />
-				<input type="hidden" name="captcha_token" value="" id="sailthruToken" />
-
-				<span class="input-group-btn">
+            }
+            ?>
+            <input type="hidden" name="sailthru_nonce" value="<?php echo esc_attr( $nonce) ; ?>" />
+            <input type="hidden" name="sailthru_email_list" value="<?php echo esc_attr( $sailthru_list ); ?>" />
+            <input type="hidden" name="action" value="add_subscriber" />
+            <input type="hidden" name="source" value="<?php echo esc_attr( $source ); ?>" />
+            <input type="hidden" name="lo_event_name" value="<?php echo esc_attr( $lo_event_name ); ?>" />
+            <input type="hidden" name="reset_optout_status" value="<?php echo esc_attr( $reset_optout_status ) ?>" />
+            <input type="hidden" name="hide_title_status" value="<?php echo esc_attr( $hide_title_status ) ?>" />
+            <input type="hidden" name="site_key" value="<?php echo esc_attr( $sailthru['google_recaptcha_site_key'] ) ?>" id="siteKey" />
+            <input type="hidden" name="captcha_token" value="" id="sailthruToken" />
+
+            <span class="input-group-btn">
 					<button class="btn btn-reverse" type="submit">
 						Submit
 					</button>
 				</span>
-		</form>
-	</div>
-	<?php
-		if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
-			echo '<script src="https://www.google.com/recaptcha/api.js?render=' . esc_attr( $sailthru['google_recaptcha_site_key'] ) . '"></script>';
-		}
-	?>
+        </form>
+    </div>
+    <?php
+    if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
+        echo '<script src="https://www.google.com/recaptcha/api.js?render=' . esc_attr( $sailthru['google_recaptcha_site_key'] ) . '"></script>';
+    }
+    ?>
 </div>

From e72a36662f80f417517b08fdb084c91d0fbc3769 Mon Sep 17 00:00:00 2001
From: polepalligayathridevi <gayathridevi.polepalli@sailthru.com>
Date: Fri, 23 Feb 2024 17:55:02 +0530
Subject: [PATCH 4/5] [INT-688_WORDPRESS_INTEGRATION_MISSING_FOR_PARAMETER]
 removed extra spaces

---
 views/widget.subscribe.display.php | 560 ++++++++++++++---------------
 1 file changed, 280 insertions(+), 280 deletions(-)

diff --git a/views/widget.subscribe.display.php b/views/widget.subscribe.display.php
index 88a1a39..dac548b 100644
--- a/views/widget.subscribe.display.php
+++ b/views/widget.subscribe.display.php
@@ -1,383 +1,383 @@
 <?php
-/*
-* Grab the settings from $instance and fill out default
-* values as needed.
-*/
-$widget_id = $this->id;
-
-$title         = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', esc_attr( $instance['title'] ) );
-$source        = empty( $instance['source'] ) ? get_bloginfo( 'url' ) : esc_attr( $instance['source'] );
-$lo_event_name = empty( $instance['lo_event_name'] ) ? '' : esc_attr( $instance['lo_event_name'] );
-$reset_optout_status = empty( $instance['reset_optout_status'] ) ? '' : esc_attr( $instance['reset_optout_status'] );
-$hide_title_status = empty( $instance['hide_title_status'] ) ? '' : esc_attr( $instance['hide_title_status'] );
-
-if ( ! empty( $instance['sailthru_list'] ) ) {
-    if ( is_array( $instance['sailthru_list'] ) ) {
-        $sailthru_list = implode( ',', $instance['sailthru_list'] );
-    } else {
-        $sailthru_list = $instance['sailthru_list'];
-    }
-} else {
-    $sailthru_list = '';
-}
-
-// display options
-$customfields = get_option( 'sailthru_forms_options' );
-$sailthru     = get_option( 'sailthru_setup_options' );
-// nonce
-$nonce = wp_create_nonce( 'add_subscriber_nonce' );
+	/*
+	* Grab the settings from $instance and fill out default
+	* values as needed.
+	*/
+	$widget_id = $this->id;
+
+	$title         = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', esc_attr( $instance['title'] ) );
+	$source        = empty( $instance['source'] ) ? get_bloginfo( 'url' ) : esc_attr( $instance['source'] );
+	$lo_event_name = empty( $instance['lo_event_name'] ) ? '' : esc_attr( $instance['lo_event_name'] );
+	$reset_optout_status = empty( $instance['reset_optout_status'] ) ? '' : esc_attr( $instance['reset_optout_status'] );
+	$hide_title_status = empty( $instance['hide_title_status'] ) ? '' : esc_attr( $instance['hide_title_status'] );
+
+	if ( ! empty( $instance['sailthru_list'] ) ) {
+		if ( is_array( $instance['sailthru_list'] ) ) {
+			$sailthru_list = implode( ',', $instance['sailthru_list'] );
+		} else {
+			$sailthru_list = $instance['sailthru_list'];
+		}
+	} else {
+		$sailthru_list = '';
+	}
+
+	// display options
+	$customfields = get_option( 'sailthru_forms_options' );
+	$sailthru     = get_option( 'sailthru_setup_options' );
+	// nonce
+	$nonce = wp_create_nonce( 'add_subscriber_nonce' );
 ?>
-<div class="sailthru-signup-widget">
-    <span class="sailthru-signup-widget-close"><a href="#sailthru-signup-widget">Close</a></span>
-    <div class="sailthru_form">
-
-        <?php
-        // title
-        if ( ! empty( $title ) ) {
-            if ( ! isset( $before_title ) ) {
-                $before_title = '';
-            }
-            if ( ! isset( $after_title ) ) {
-                $after_title = '';
-            }
+	<div class="sailthru-signup-widget">
+		<span class="sailthru-signup-widget-close"><a href="#sailthru-signup-widget">Close</a></span>
+		<div class="sailthru_form">
+
+			<?php
+				// title
+				if ( ! empty( $title ) ) {
+					if ( ! isset( $before_title ) ) {
+						$before_title = '';
+					}
+					if ( ! isset( $after_title ) ) {
+						$after_title = '';
+					}
 
-            if ( isset( $hide_title_status ) && $hide_title_status=="on") {
-                $before_title= substr($before_title, 0, -2) . " hide_toggle" . '">';
-            }
+					if ( isset( $hide_title_status ) && $hide_title_status=="on") {
+						$before_title= substr($before_title, 0, -2) . " hide_toggle" . '">';
+					}
 
-            echo  wp_kses_post( $before_title . trim( $title ) . $after_title );
-        }
+					echo  wp_kses_post( $before_title . trim( $title ) . $after_title );
+				}
 
-        // success message
-        if ( empty( $customfields['sailthru_customfield_success'] ) ) {
-            $success = 'Thank you for subscribing!';
-        } else {
-            $success = $customfields['sailthru_customfield_success'];
-        }
-        ?>
+					// success message
+				if ( empty( $customfields['sailthru_customfield_success'] ) ) {
+					$success = 'Thank you for subscribing!';
+				} else {
+					$success = $customfields['sailthru_customfield_success'];
+				}
+			?>
 
-        <div class="success" hidden="hidden"><?php echo esc_html( $success ); ?></div>
+			<div class="success" hidden="hidden"><?php echo esc_html( $success ); ?></div>
 
-        <form method="post" action="#" class="sailthru-add-subscriber-form" id="<?php echo esc_attr( $widget_id ) ?>">
+			<form method="post" action="#" class="sailthru-add-subscriber-form" id="<?php echo esc_attr( $widget_id ) ?>">
 
-            <div class="sailthru-add-subscriber-errors"></div>
+				<div class="sailthru-add-subscriber-errors"></div>
 
-            <div class="sailthru_form_input form-group">
-                <label class="sailthru-widget-label" for="st_wp_email">Email</label>
-                <input type="text" name="email" value="" class="form-control sailthru_email" id="st_wp_email"/>
-            </div>
+				<div class="sailthru_form_input form-group">
+					<label class="sailthru-widget-label" for="st_wp_email">Email</label>
+					<input type="text" name="email" value="" class="form-control sailthru_email" id="st_wp_email" />
+				</div>
 
-            <?php
+				<?php
 
 
-            $key = get_option( 'sailthru_forms_key' );
+					$key = get_option( 'sailthru_forms_key' );
 
 
-            // figure out display needs and order when using short code
-            if ( isset( $instance['using_shortcode'] ) && $instance['using_shortcode'] ) {
+					// figure out display needs and order when using short code
+					if ( isset( $instance['using_shortcode'] ) && $instance['using_shortcode'] ) {
 
-                if ( ! empty( $instance['fields'] ) ) {
-                    $order  = '';
-                    $fields = explode( ',', $instance['fields'] );
-                    foreach ( $fields as $field ) {
-                        $field         = trim( $field );
-                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $field );
-                        $instance[ 'show_' . $name_stripped . '_name' ]     = true;
-                        $instance[ 'show_' . $name_stripped . '_required' ] = false;
-                        for ( $i = 1; $i <= $key; $i++ ) {
-                            if ( isset( $customfields[ $i ] ) ) {
-                                $db_name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $i ]['sailthru_customfield_name'] );
+						if ( ! empty( $instance['fields'] ) ) {
+							$order  = '';
+							$fields = explode( ',', $instance['fields'] );
+							foreach ( $fields as $field ) {
+								$field         = trim( $field );
+								$name_stripped = preg_replace( '/[^\da-z]/i', '_', $field );
+								$instance[ 'show_' . $name_stripped . '_name' ]     = true;
+								$instance[ 'show_' . $name_stripped . '_required' ] = false;
+								for ( $i = 1; $i <= $key; $i++ ) {
+									if ( isset( $customfields[ $i ] ) ) {
+										$db_name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $i ]['sailthru_customfield_name'] );
 
-                                if ( $name_stripped === $db_name_stripped ) {
-                                    $order .= $i . ',';
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    $order_list = explode( ',', $order );
-                }
-            } else {
-                // figure out which fields we need to show when NOT using shortcodde
-                foreach ( $instance as $field ) {
+										if ( $name_stripped === $db_name_stripped ) {
+											$order .= $i . ',';
+											break;
+										}
+									}
+								}
+							}
+							$order_list = explode( ',', $order );
+						}
+					} else {
+						// figure out which fields we need to show when NOT using shortcodde
+						foreach ( $instance as $field ) {
 
-                    if ( is_array( $field ) ) {
-                        continue;
-                    }
+							if ( is_array( $field ) ) {
+								continue;
+							}
 
-                    $name_stripped                                      = preg_replace( '/[^\da-z]/i', '_', $field );
-                    $instance[ 'show_' . $name_stripped . '_name' ]     = true;
-                    $instance[ 'show_' . $name_stripped . '_required' ] = false;
+							$name_stripped                                      = preg_replace( '/[^\da-z]/i', '_', $field );
+							$instance[ 'show_' . $name_stripped . '_name' ]     = true;
+							$instance[ 'show_' . $name_stripped . '_required' ] = false;
 
-                } // end foreach
+						} // end foreach
 
-                // determine order of fields.
-                if ( empty( $order ) && isset( $instance['field_order'] ) ) {
-                    $order = $instance['field_order'];
-                }
+						// determine order of fields.
+						if ( empty( $order ) && isset( $instance['field_order'] ) ) {
+							$order = $instance['field_order'];
+						}
 
-                if ( empty( $order ) ) {
-                    $order = get_option( 'sailthru_customfield_order' );
-                }
+						if ( empty( $order ) ) {
+							$order = get_option( 'sailthru_customfield_order' );
+						}
 
 
-                if ( isset( $order ) && '' !== $order ) {
-                    $order_list = explode( ',', $order );
-                }
-            }
+						if ( isset( $order ) && '' !== $order ) {
+							$order_list = explode( ',', $order );
+						}
+					}
 
-            // widget is rendered using Appearance > Widget
-            if ( isset( $order_list ) ) {
+					// widget is rendered using Appearance > Widget
+				if ( isset( $order_list ) ) {
 
-                for ( $i = 0; $i < count( $order_list ); $i++ ) {
-                    $field_key = (int) $order_list[ $i ];
+					for ( $i = 0; $i < count( $order_list ); $i++ ) {
+						$field_key = (int) $order_list[ $i ];
 
-                    if ( ! empty( $customfields[ $field_key ] ) ) {
-                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
+						if ( ! empty( $customfields[ $field_key ] ) ) {
+							$name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
 
 
-                        if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
+							if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
 
-                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-                            } else {
-                                $attributes = '';
-                            }
+								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+								} else {
+									$attributes = '';
+								}
 
-                            echo '<div class="sailthru_form_input form-group">';
+								echo '<div class="sailthru_form_input form-group">';
 
-                            if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+								if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
 
-                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
-                                echo '<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
+									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+									echo '<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
 
-                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-                                echo '<option value=""></option>';
-                                foreach ( $items as $item ) {
-                                    if ( ! empty( $item ) ) {
-                                        $vals = explode( ':', $item );
-                                        echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( $vals[0] ) . '</option>';
-                                    }
-                                }
+									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+									echo '<option value=""></option>';
+									foreach ( $items as $item ) {
+										if ( ! empty( $item ) ) {
+											$vals = explode( ':', $item );
+											echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( $vals[0] ) . '</option>';
+										}
+									}
 
-                                echo '</select>';
+									echo '</select>';
 
-                            } elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+								} elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
 
-                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-                                echo '<div class="radio">';
-                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+									echo '<div class="radio">';
+									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                foreach ( $items as $item ) {
-                                    if ( ! empty( $item ) ) {
-                                        $vals = explode( ':', $item );
-                                        echo '<input ';
+									foreach ( $items as $item ) {
+										if ( ! empty( $item ) ) {
+											$vals = explode( ':', $item );
+											echo '<input ';
 
-                                        if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-                                            echo 'required=required ';
-                                        }
-                                        echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '" ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
-                                    }
-                                }
+											if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+												echo 'required=required ';
+											}
+											echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '" ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+										}
+									}
 
-                                echo '</div>';
-                            } elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                                $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+									echo '</div>';
+								} elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+									$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-                                echo '<div class="checkbox">';
-                                echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+									echo '<div class="checkbox">';
+									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                foreach ( $items as $item ) {
+                                    foreach ( $items as $item ) {
 
-                                    if ( ! empty( $item ) ) {
-                                        $vals = explode( ':', $item );
+										if ( ! empty( $item ) ) {
+											$vals = explode( ':', $item );
 
-                                        echo '<input ';
+											echo '<input ';
 
-                                        if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-                                            echo 'required=required ';
-                                        }
+											if ( 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+												echo 'required=required ';
+											}
 
 
 
-                                        echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
-                                    }
-                                }
-                                echo '</div>';
+                                                echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+										}
+									}
+									echo '</div>';
 
-                            } else {
+								} else {
 
-                                //check if the field is required
-                                if ( 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
+									//check if the field is required
+									if ( 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
 
-                                    echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+										echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                    echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
+										echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
 
-                                    if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type']  ) {
-                                        echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-                                    }
+										if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type']  ) {
+											echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+										}
 
-                                    echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
+										echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
 
-                                } else {
+									} else {
 
-                                    echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+										echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                    echo '<input ';
+										echo '<input ';
 
-                                    if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                                        echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-                                    }
+										if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+											echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+										}
 
-                                    echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
+										echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
 
-                                }
-                            }
+									}
+								}
 
-                            echo '</div>'; // end of .sailthru_form_input .form-group
+								echo '</div>'; // end of .sailthru_form_input .form-group
 
-                        } //end if !empty name
-                    } // end if !empty field key
-                }// end for loop
+							} //end if !empty name
+						} // end if !empty field key
+					}// end for loop
 
 
-                // widget is rendered using shortcode.
-                // $order is specified in the way the user listed the fields
-                // not by some saved fields_order
-            } else {
+					// widget is rendered using shortcode.
+					// $order is specified in the way the user listed the fields
+					// not by some saved fields_order
+				} else {
 
-                for ( $i = 0; $i < $key; $i++ ) {
-                    $field_key = $i + 1;
+					for ( $i = 0; $i < $key; $i++ ) {
+						$field_key = $i + 1;
 
 
-                    if ( ! empty( $customfields[ $field_key ] ) ) {
-                        $name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
+						if ( ! empty( $customfields[ $field_key ] ) ) {
+							$name_stripped = preg_replace( '/[^\da-z]/i', '_', $customfields[ $field_key ]['sailthru_customfield_name'] );
 
-                        if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
+							if ( ! empty( $instance[ 'show_' . $name_stripped . '_name' ] ) ) {
 
-                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-                            } else {
-                                $attributes = '';
-                            }
-                        }
+								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+								} else {
+									$attributes = '';
+								}
+							}
 
-                        echo '<div class="sailthru_form_input form-group">';
+							echo '<div class="sailthru_form_input form-group">';
 
-                        if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>
+							if ( 'select' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>
 									<select ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id" class="form-control">';
-                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-                            foreach ( $items as $item ) {
-                                $vals = explode( ':', $item );
-                                echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( isset( $vals[0] ) ? $vals[0] : '' ) . '</option>';
-                            }
+								foreach ( $items as $item ) {
+									$vals = explode( ':', $item );
+									echo '<option value="' . esc_attr( $vals[1] ) . '">' . esc_attr( isset( $vals[0] ) ? $vals[0] : '' ) . '</option>';
+								}
 
-                            echo '</select>';
-                        } elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
-                            echo '<div class="radio">';
-                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+								echo '</select>';
+							} elseif ( 'radio' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+								echo '<div class="radio">';
+								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                            foreach ( $items as $item ) {
-                                $vals = explode( ':', $item );
-                                echo '<input ';
+								foreach ( $items as $item ) {
+									$vals = explode( ':', $item );
+									echo '<input ';
 
-                                if ('checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
-                                    echo 'required=required ';
-                                }
+									if ('checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) {
+										echo 'required=required ';
+									}
 
-                                echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
-                            }
+									echo 'type="radio" name="custom_' . esc_attr( $name_stripped ) . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
+								}
 
-                            echo '</div>';
-                        } elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                            $items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
+								echo '</div>';
+							} elseif ( 'checkbox' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+								$items = explode( ',', $customfields[ $field_key ]['sailthru_customfield_value'] );
 
-                            echo '<div class="checkbox">';
-                            echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
+								echo '<div class="checkbox">';
+								echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                            foreach ( $items as $item ) {
-                                $vals = explode( ':', $item );
-                                echo '<input ';
+								foreach ( $items as $item ) {
+									$vals = explode( ':', $item );
+									echo '<input ';
 
-                                if ( isset( $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) && 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ]  ) {
-                                    echo 'required=required ';
-                                }
+									if ( isset( $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ] ) && 'checked' === $instance[ 'show_' . esc_attr( $name_stripped ) . '_required' ]  ) {
+										echo 'required=required ';
+									}
 
-                                echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
-                            }
+									echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"> ' . esc_html( isset( $vals[0] ) ? $vals[0] : '' ) . '';
+								}
 
-                            echo '</div>';
-                        } else {
+								echo '</div>';
+							} else {
 
-                            if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
-                                $attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
-                            } else {
-                                $attributes = '';
-                            }
+								if ( ! empty( $customfields[ $field_key ]['sailthru_customfield_attr'] ) ) {
+									$attributes = $customfields[ $field_key ]['sailthru_customfield_attr'];
+								} else {
+									$attributes = '';
+								}
 
-                            //check if the field is required
-                            if ( isset( $instance[ 'show_' . $name_stripped . '_required' ] ) && 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
+								//check if the field is required
+								if ( isset( $instance[ 'show_' . $name_stripped . '_required' ] ) && 'checked' === $instance[ 'show_' . $name_stripped . '_required' ] ) {
 
-                                echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
+									echo '<input ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ';
 
-                                if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                                    echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-                                }
+									if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+										echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+									}
 
-                                echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
+									echo esc_attr( sailthru_attributes( $attributes ) ) . 'required="required" name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_name" class="form-control"/>';
 
-                            } else {
+								} else {
 
-                                echo '<input ';
+									echo '<input ';
 
-                                if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
-                                    echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
-                                }
+									if ( 'hidden' === $customfields[ $field_key ]['sailthru_customfield_type'] ) {
+										echo 'value="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_value'] ) . '" ';
+									}
 
-                                echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
+									echo ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'] ) ) . ' type="' . esc_attr( $customfields[ $field_key ]['sailthru_customfield_type'] ) . '" ' . esc_attr( sailthru_attributes( $attributes ) ) . 'name="custom_' . esc_attr( $name_stripped ) . '" id="sailthru_' . esc_attr( $name_stripped ) . '_id"  class="form-control"/>';
 
-                            }
-                        }
+								}
+							}
 
-                        echo '</div>'; // end .sailthru_form_input .form-group
+							echo '</div>'; // end .sailthru_form_input .form-group
 
-                    } //end if !empty name
-                } // end for
-            } // end if there are fields
-            ?>
+						} //end if !empty name
+					} // end for
+				} // end if there are fields
+				?>
 
-            <?php
-            if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
-                echo '<p class="captcha-disclaimer">
+				<?php
+					if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
+						echo '<p class="captcha-disclaimer">
 						This site is protected by reCAPTCHA and the Google <a href="https://policies.google.com/privacy">Privacy Policy</a> and
 						<a href="https://policies.google.com/terms">Terms of Service</a> apply.
 						</p>';
-            }
-            ?>
-            <input type="hidden" name="sailthru_nonce" value="<?php echo esc_attr( $nonce) ; ?>" />
-            <input type="hidden" name="sailthru_email_list" value="<?php echo esc_attr( $sailthru_list ); ?>" />
-            <input type="hidden" name="action" value="add_subscriber" />
-            <input type="hidden" name="source" value="<?php echo esc_attr( $source ); ?>" />
-            <input type="hidden" name="lo_event_name" value="<?php echo esc_attr( $lo_event_name ); ?>" />
-            <input type="hidden" name="reset_optout_status" value="<?php echo esc_attr( $reset_optout_status ) ?>" />
-            <input type="hidden" name="hide_title_status" value="<?php echo esc_attr( $hide_title_status ) ?>" />
-            <input type="hidden" name="site_key" value="<?php echo esc_attr( $sailthru['google_recaptcha_site_key'] ) ?>" id="siteKey" />
-            <input type="hidden" name="captcha_token" value="" id="sailthruToken" />
-
-            <span class="input-group-btn">
+					}
+				?>
+				<input type="hidden" name="sailthru_nonce" value="<?php echo esc_attr( $nonce) ; ?>" />
+				<input type="hidden" name="sailthru_email_list" value="<?php echo esc_attr( $sailthru_list ); ?>" />
+				<input type="hidden" name="action" value="add_subscriber" />
+				<input type="hidden" name="source" value="<?php echo esc_attr( $source ); ?>" />
+				<input type="hidden" name="lo_event_name" value="<?php echo esc_attr( $lo_event_name ); ?>" />
+				<input type="hidden" name="reset_optout_status" value="<?php echo esc_attr( $reset_optout_status ) ?>" />
+				<input type="hidden" name="hide_title_status" value="<?php echo esc_attr( $hide_title_status ) ?>" />
+				<input type="hidden" name="site_key" value="<?php echo esc_attr( $sailthru['google_recaptcha_site_key'] ) ?>" id="siteKey" />
+				<input type="hidden" name="captcha_token" value="" id="sailthruToken" />
+
+				<span class="input-group-btn">
 					<button class="btn btn-reverse" type="submit">
 						Submit
 					</button>
 				</span>
-        </form>
-    </div>
-    <?php
-    if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
-        echo '<script src="https://www.google.com/recaptcha/api.js?render=' . esc_attr( $sailthru['google_recaptcha_site_key'] ) . '"></script>';
-    }
-    ?>
+		</form>
+	</div>
+	<?php
+		if ( ! empty( $sailthru['google_recaptcha_site_key'] ) && ! empty ( $sailthru['google_recaptcha_secret'] ) ) {
+			echo '<script src="https://www.google.com/recaptcha/api.js?render=' . esc_attr( $sailthru['google_recaptcha_site_key'] ) . '"></script>';
+		}
+	?>
 </div>

From 5228ccc920bc0f0aa7a637315c9517c98b913057 Mon Sep 17 00:00:00 2001
From: polepalligayathridevi <gayathridevi.polepalli@sailthru.com>
Date: Fri, 23 Feb 2024 18:28:23 +0530
Subject: [PATCH 5/5] [INT-688_WORDPRESS_INTEGRATION_MISSING_FOR_PARAMETER]
 extra spaces removed

---
 views/widget.subscribe.display.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/widget.subscribe.display.php b/views/widget.subscribe.display.php
index dac548b..7646090 100644
--- a/views/widget.subscribe.display.php
+++ b/views/widget.subscribe.display.php
@@ -187,7 +187,7 @@
 									echo '<div class="checkbox">';
 									echo '<label for="custom_' . esc_attr( $name_stripped ) . '">' . esc_html( $customfields[ $field_key ]['sailthru_customfield_label'] ) . '</label>';
 
-                                    foreach ( $items as $item ) {
+									foreach ( $items as $item ) {
 
 										if ( ! empty( $item ) ) {
 											$vals = explode( ':', $item );
@@ -200,7 +200,7 @@
 
 
 
-                                                echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
+											echo 'type="checkbox" name="custom_' . esc_attr( $name_stripped ) .  (count( $items) > 1 ? '[]' : '') . '" value="' . esc_attr( $vals[1] ) . '"  ' . ( sailthru_field_class( $customfields[ $field_key ]['sailthru_customfield_class'], $customfields[ $field_key ]['sailthru_customfield_type'] ) ) . ' ' . esc_attr( sailthru_attributes( $attributes ) ) . '> ' . esc_html( $vals[0] ) . '';
 										}
 									}
 									echo '</div>';