Merge pull request #454 from brainstormforce/next-release

Chore v1.6.7

.eslintrc.js

@@ -0,0 +1,50 @@
+/**
+ * Internal dependencies
+ */
+
+module.exports = {
+	root: true,
+	extends: [
+		'plugin:@wordpress/eslint-plugin/recommended-with-formatting',
+		'plugin:import/recommended',
+		'plugin:eslint-comments/recommended',
+	],
+	env: {
+		browser: true,
+	},
+	parserOptions: {
+		requireConfigFile: false,
+		babelOptions: {
+			presets: [ require.resolve( '@wordpress/babel-preset-default' ) ],
+		},
+	},
+	overrides: [
+		{
+			files: [
+				'tests/e2e/**/*.js',
+			],
+			extends: [
+				'plugin:@wordpress/eslint-plugin/test-e2e',
+				'plugin:jest/all',
+			],
+			settings: {
+				jest: {
+					version: 26,
+				},
+			},
+			rules: {
+				'jest/lowercase-name': [
+					'error',
+					{
+						ignore: [
+							'describe',
+						],
+					},
+				],
+				'jest/no-hooks': 'off',
+				'jest/prefer-expect-assertions': 'off',
+				'jest/prefer-inline-snapshots': 'off',
+			},
+		},
+	],
+};

README.md

@@ -1,11 +1,11 @@
 # Elementor Header & Footer Builder #
-**Contributors:** [brainstormforce](https://profiles.wordpress.org/brainstormforce), [Nikschavan](https://profiles.wordpress.org/Nikschavan)  
+**Contributors:** [brainstormforce](https://profiles.wordpress.org/brainstormforce/), [nikschavan](https://profiles.wordpress.org/nikschavan/)  
 **Tags:** elementor, header footer builder, header template, footer template, elementor widget, WordPress header, WordPress footer, elementor menu, website header design, footer design, blocks  
 **Donate link:** https://www.paypal.me/BrainstormForce  
 **Requires at least:** 4.4  
 **Requires PHP:** 5.4  
 **Tested up to:** 5.8.2  
-**Stable tag:** 1.6.6  
+**Stable tag:** 1.6.7  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -137,6 +137,9 @@ This same applies when you are creating your Header/Footer using this plugin.
 5. Default widgets available with Elementor Header & Footer Builder.
 
 ## Changelog ##
+### 1.6.7 ###
+- Improvement: Added GDPR support to Subscription form.
+
 ### 1.6.6 ###
 - Improvement: Added compatibility to Elementor core version 3.5.0. Now to work with EHF, Elementor minimum version 3.1.0 or higher will be required.
 - Fix: PHP warning of undefined array key on responsive controls in all widgets.

admin/assets/css/ehf-admin.css

@@ -167,6 +167,17 @@ li#toplevel_page_Settings-page,
     transition: all 0.25s ease;
     pointer-events: none;
 }
+
+.hfe-subscription-row input#hfe_subscribe_accept {
+	border: 1px solid #585F66;
+	border-radius: 3px;
+	margin: 0 4px 0 0;
+}
+
+.hfe-guide-modal-popup .hfe-guide-modal-popup-wrapper .hfe-subscription-row .hfe-input-container:nth-of-type(3) {
+	margin-bottom: 16px;
+}
+
 .hfe-subscription-row .hfe-input-container:not(.subscription-success, .subscription-error) .hfe-subscribe-field:hover {
     border-color: #2271b1;
 }

admin/assets/js/ehf-admin.js

@@ -140,12 +140,14 @@
 			var email_field = $('.hfe-subscribe-field[name="hfe_subscribe_email"]');
 			var user_type_field = $('.hfe-subscribe-field[name="wp_user_type"]');
 			var build_for_field = $('.hfe-subscribe-field[name="build_website_for"]');
+			var accept_field = $('.hfe_subscribe_accept[name="hfe_subscribe_accept"]');
 
 			var subscription_first_name = first_name_field.val() || '';
 			var subscription_email = email_field.val() || '';
 			var subscription_user_type = user_type_field.val() || '';
 			var subscription_build_for = build_for_field.val() || '';
 			var button_text = submit_button.find( '.hfe-submit-button-text' );
+			var subscription_accept = accept_field.is( ':checked' ) ? '1' : '0';
 
 			HFEAdmin._validate_field( first_name_field );
 			HFEAdmin._validate_field( email_field );
@@ -172,6 +174,7 @@
 				PAGE_BUILDER: "1",
 				WP_USER_TYPE: subscription_user_type,
 				BUILD_WEBSITE_FOR: subscription_build_for,
+				OPT_IN: subscription_accept,
 				SOURCE: hfe_admin_data.data_source
 			};
 

header-footer-elementor.php

@@ -7,14 +7,14 @@
  * Author URI:  https://www.brainstormforce.com/
  * Text Domain: header-footer-elementor
  * Domain Path: /languages
- * Version: 1.6.6
- * Elementor tested up to: 3.5.0
+ * Version: 1.6.7
+ * Elementor tested up to: 3.5.3
  * Elementor Pro tested up to: 3.5.2
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.6' );
+define( 'HFE_VER', '1.6.7' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );

inc/class-hfe-settings-page.php

@@ -454,6 +454,10 @@ public function get_form_row_2() {
 					<small class="subscription-desc"><?php esc_html_e( 'Email address is required', 'header-footer-elementor' ); ?></small>
 					<label class="subscription-label"><?php esc_html_e( 'Your Work Email', 'header-footer-elementor' ); ?></label>
 				</div>
+				<div class="hfe-input-container">
+					<input type="checkbox" name="hfe_subscribe_accept" id="hfe_subscribe_accept" class="hfe_subscribe_accept" value="check">
+					<label for="hfe_subscribe_accept" class="hfe-subscribe-accept-label"><?php esc_html_e( 'I agree to receive your newsletters and accept the data privacy statement.', 'header-footer-elementor' ); ?></label>
+				</div>
 			</div>
 			<p class="submit">
 				<button type="submit" id="submit-2"  class="button submit-2 button-primary">

languages/header-footer-elementor.pot

@@ -2,10 +2,10 @@
 # This file is distributed under the same license as the Elementor Header & Footer Builder package.
 msgid ""
 msgstr ""
-"Project-Id-Version: Elementor Header & Footer Builder 1.6.6\n"
+"Project-Id-Version: Elementor Header & Footer Builder 1.6.7\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/header-footer-elementor\n"
-"POT-Creation-Date: 2021-12-20 07:48:07+00:00\n"
+"POT-Creation-Date: 2021-12-29 13:31:24+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -304,15 +304,15 @@ msgstr ""
 msgid "Theme Support"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:61 inc/class-hfe-settings-page.php:665
+#: inc/class-hfe-settings-page.php:61 inc/class-hfe-settings-page.php:667
 msgid "Activate"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:62 inc/class-hfe-settings-page.php:657
+#: inc/class-hfe-settings-page.php:62 inc/class-hfe-settings-page.php:659
 msgid "Activated"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:63 inc/class-hfe-settings-page.php:654
+#: inc/class-hfe-settings-page.php:63 inc/class-hfe-settings-page.php:656
 #: inc/widgets-manager/widgets/class-navigation-menu.php:1054
 #: inc/widgets-manager/widgets/class-navigation-menu.php:1236
 msgid "Active"
@@ -322,11 +322,11 @@ msgstr ""
 msgid "Deactivate"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:65 inc/class-hfe-settings-page.php:662
+#: inc/class-hfe-settings-page.php:65 inc/class-hfe-settings-page.php:664
 msgid "Inactive"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:66 inc/class-hfe-settings-page.php:678
+#: inc/class-hfe-settings-page.php:66 inc/class-hfe-settings-page.php:680
 msgid "Install"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "Already Exists."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:71 inc/class-hfe-settings-page.php:683
+#: inc/class-hfe-settings-page.php:71 inc/class-hfe-settings-page.php:685
 msgid "Visit Website"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgid ""
 msgstr ""
 
 #: inc/class-hfe-settings-page.php:185 inc/class-hfe-settings-page.php:186
-#: inc/class-hfe-settings-page.php:801
+#: inc/class-hfe-settings-page.php:803
 msgid "Settings"
 msgstr ""
 
@@ -487,21 +487,25 @@ msgstr ""
 msgid "Your Work Email"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:460
+#: inc/class-hfe-settings-page.php:457
+msgid "I agree to receive your newsletters and accept the data privacy statement."
+msgstr ""
+
+#: inc/class-hfe-settings-page.php:462
 msgid "Submit"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:514
+#: inc/class-hfe-settings-page.php:516
 msgid "Welcome to Elementor Header & Footer Builder!"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:516
+#: inc/class-hfe-settings-page.php:518
 msgid ""
 "With this awesome plugin, experience the easiest way to create a customized "
 "header and footer for your website with Elementor. That too 100% FREE!"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:518
+#: inc/class-hfe-settings-page.php:520
 msgid ""
 "Design beautiful layouts with simple drag & drop and display them at "
 "desired location with powerful target controls. The plugin comes with "
@@ -510,78 +514,78 @@ msgid ""
 "backed up by 24/7 support."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:520
+#: inc/class-hfe-settings-page.php:522
 msgid ""
 "Trusted by more than 1+ Million users, Elementor Header & Footer Builder is "
 "a modern way to build advanced navigation for your website."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:522
+#: inc/class-hfe-settings-page.php:524
 msgid ""
 "This plugin is brought to you by the same team behind the popular WordPress "
 "theme Astra and a series of Ultimate Addons plugins."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:528
+#: inc/class-hfe-settings-page.php:530
 msgid "Team photo"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:530
+#: inc/class-hfe-settings-page.php:532
 msgid "Brainstorm Force Team"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:574
+#: inc/class-hfe-settings-page.php:576
 #. translators: %s - addon status label.
 msgid "%1$s %3$s %2$s"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:591
+#: inc/class-hfe-settings-page.php:593
 #. translators: %s - addon status label.
 msgid "Status: %s"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:610
+#: inc/class-hfe-settings-page.php:612
 msgid "WordPress.org"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:675
+#: inc/class-hfe-settings-page.php:677
 msgid "Not Installed"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:708
+#: inc/class-hfe-settings-page.php:710
 msgid "Astra Theme"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:709
+#: inc/class-hfe-settings-page.php:711
 msgid ""
 "Powering over 1+ Million websites, Astra is loved for the fast performance "
 "and ease of use it offers. It is suitable for all kinds of websites like "
 "blogs, portfolios, business, and WooCommerce stores."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:720
+#: inc/class-hfe-settings-page.php:722
 msgid "Starter Templates"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:721
+#: inc/class-hfe-settings-page.php:723
 msgid ""
 "A popular templates plugin that provides an extensive library of "
 "professional and fully customizable 600+ ready website and templates. More "
 "than 1+ Million websites have built with this plugin."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:732
+#: inc/class-hfe-settings-page.php:734
 msgid "Ultimate Addons for Elementor"
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:733
+#: inc/class-hfe-settings-page.php:735
 msgid ""
 "It’s a collection of 40+ unique, creative, and optimized Elementor widgets "
 "with 100+ readymade templates. Trusted by more than 600+ K web "
 "professionals. It’s a #1 toolkit for Elementor Page Builder."
 msgstr ""
 
-#: inc/class-hfe-settings-page.php:800
+#: inc/class-hfe-settings-page.php:802
 msgid "Go to HFE Settings page"
 msgstr ""