Updated version. Fix issue with input fields

Author: oleksandr-mykhailenko

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## Changelog
 
+##### 6.1.4
+- Fix issues in the input fields. Tested with new WP version
+
 ##### 6.1.2
  - Fix possible error when code switch websites and could leave website in a broken state
 

README.md

@@ -3,8 +3,8 @@
 - Contributors: Mailjet
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
-- Tested up to: 6.6.2
-- Stable tag: 6.1.3
+- Tested up to: 6.8.1
+- Stable tag: 6.1.4
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -162,6 +162,9 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 ## Changelog
 
+##### 6.1.4
+- Fix issues in the input fields. Tested with new WP version
+
 ##### 6.1.2
 - Fix possible error when code switch websites and could leave website in a broken state
 

readme.txt

@@ -3,8 +3,8 @@
 - Contributors: Mailjet
 - Tags: email, marketing, signup, newsletter, widget, smtp, woocommerce, contact form 7
 - Requires at least: 4.4
-- Tested up to: 6.6.2
-- Stable tag: 6.1.3
+- Tested up to: 6.8.1
+- Stable tag: 6.1.4
 - Requires PHP: 7.4
 - License: GPLv2 or later
 - License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -152,6 +152,9 @@ find vendor/ -type d -name ".git" -exec rm -rf {} \;
 
 == Changelog ==
 
+= 6.1.4 =
+- Fix issues in the input fields. Tested with new WP version
+
 = 6.1.2 =
  - Fix possible error when code switch websites and could leave website in a broken state
 

src/includes/MailjetSettings.php

@@ -328,11 +328,7 @@ public static function redirectJs( $urlToRedirect ) {
         }
         ?>
         <script type="text/javascript">
-            window.location.href = '
-            <?php
-            echo esc_attr($urlToRedirect);
-            ?>
-            ';
+            window.location.href = '<?php echo esc_attr($urlToRedirect); ?> ';
         </script>
         <?php
         echo esc_attr('<META HTTP-EQUIV="refresh" content="0;URL=' . $urlToRedirect . '">');

src/includes/SettingsPages/EnableSendingSettings.php

@@ -80,11 +80,7 @@ public function mailjet_enable_sending_cb( $args ) {
                     _e('From: Name', 'mailjet-for-wordpress');
                     ?>
                     </b></label>
-                    <input name="mailjet_from_name" type="text" id="mailjet_from_name" value="
-                    <?php
-                    echo esc_attr($mailjetFromName);
-                    ?>
-                    " class="regular-text code">
+                    <input name="mailjet_from_name" type="text" id="mailjet_from_name" value="<?php echo esc_attr($mailjetFromName);?>" class="regular-text code">
                 </div>
                 <div id="mailjet_from_email_fields" class="fromFld">
                     <label class="mj-label" for="mailjet_from_email"><b>
@@ -114,11 +110,7 @@ public function mailjet_enable_sending_cb( $args ) {
                                 }
                             }
                             ?>
-                            <option value="
-                            <?php
-                            echo esc_attr($mailjetSender['Email']);
-                            ?>
-                            " 
+                            <option value="<?php echo esc_attr($mailjetSender['Email']);?>"
                             <?php
 							echo esc_attr($mailjetFromEmail == $mailjetSender['Email']) ? 'selected="selected"' : '';
 							?>
@@ -156,7 +148,7 @@ public function mailjet_enable_sending_cb( $args ) {
                         echo esc_attr($mailjetPort) == 25 ? 'selected="selected"' : '';
                         ?>
                         > 25 </option>
-                        <option value="465" 
+                        <option value="465"
                         <?php
                         echo esc_attr($mailjetPort) == 465 ? 'selected="selected"' : '';
                         ?>
@@ -206,11 +198,7 @@ public function mailjet_enable_sending_cb( $args ) {
                         </b></label>
                         <div class="test_email_fields_group">
                             <input type="text" size="30" name="mailjet_test_address" id="mailjet_test_address" />
-                            <input type="submit" value="
-                            <?php
-                            _e('Send', 'mailjet-for-wordpress');
-                            ?>
-                            " name="send_test_email_btn" class="mj-btn btnSecondary MailjetSubmit" id="send_test_email_btn"/>
+                            <input type="submit" value="<?php _e('Send', 'mailjet-for-wordpress');?>" name="send_test_email_btn" class="mj-btn btnSecondary MailjetSubmit" id="send_test_email_btn"/>
                         </div>
                     </div>
                 </div>

src/includes/SettingsPages/InitialSettings.php

@@ -71,21 +71,13 @@ public function mailjet_initial_settings_cb( $args ) {
                 _e('<b>Api Key</b>', 'mailjet-for-wordpress');
             ?>
             </label>
-            <input name="mailjet_apikey" type="text" id="mailjet_apikey" value="
-            <?php
-            echo esc_attr($mailjetApikey);
-            ?>
-            " class="mailjet_apikey" required="required">
+            <input name="mailjet_apikey" type="text" id="mailjet_apikey" value="<?php echo trim(esc_attr($mailjetApikey));?>" class="mailjet_apikey" required="required">
             <label class="mj-label" for="mailjet_apisecret">
             <?php
                 _e('<b>Secret Key</b>', 'mailjet-for-wordpress');
             ?>
             </label>
-            <input name="mailjet_apisecret" type="text" id="mailjet_apisecret" value="
-            <?php
-            echo esc_attr($mailjetApiSecret);
-            ?>
-            " class="mailjet_apisecret" required="required">
+            <input name="mailjet_apisecret" type="text" id="mailjet_apisecret" value="<?php echo trim(esc_attr($mailjetApiSecret));?>" class="mailjet_apisecret" required="required">
         </fieldset>
 
         <?php

src/includes/SettingsPages/IntegrationsSettings.php

@@ -216,11 +216,7 @@ private function wooIntegration( $mailjetSyncContactList ) {
                         echo __('Checkbox text', 'mailjet-for-wordpress');
                         ?>
                         </label>
-                        <input name="woocommerce[mailjet_woo_checkout_box_text]" id="sub_letter" type="text" value="
-                        <?php
-                        echo esc_attr($checkoutCheckboxText);
-                        ?>
-                        " class="mj-text-field" placeholder="
+                        <input name="woocommerce[mailjet_woo_checkout_box_text]" id="sub_letter" type="text" value="<?php echo esc_attr($checkoutCheckboxText);?>" class="mj-text-field" placeholder="
                         <?php
 						echo __('Subscribe to our newsletter', 'mailjet-for-wordpress');
 						?>

wp-mailjet.php

@@ -14,8 +14,8 @@
  * Plugin Name:       Mailjet for WordPress
  * Plugin URI:        https://www.mailjet.com/partners/wordpress/
  * Description:       The Best WordPress Plugin For Email Newsletters.
- * Version:           6.1.3
- * Tested up to:      6.6.2
+ * Version:           6.1.4
+ * Tested up to:      6.8.1
  * Author:            Mailjet SAS
  * Author URI:        http://mailjet.com
  * License:           GPL-2.0+
@@ -56,7 +56,7 @@
 /**
  * Mailjet plugin version.
  */
-define('MAILJET_VERSION', '6.1.3');
+define('MAILJET_VERSION', '6.1.4');
 
 /**
  * Mailjet Plugid dir.