Merge pull request #793 from brainstormforce/release-candidate

Build: Version 1.6.27
brainstormforce · Apr 15, 2024 · dcce8a3 · dcce8a3
2 parents 3d0584a + 5d358d9
commit dcce8a3
Show file tree

Hide file tree

Showing 10 changed files with 715 additions and 142 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -40,20 +40,5 @@ jobs:
       - name: npm install, build
         run: npm ci
 
-      - name: Start Docker environment
-        run: npm run env:start
-        env:
-          COMPOSE_INTERACTIVE_NO_CLI: true
-
-      - name: E2E Tests
-        if: always()
-        run: npm run test:e2e:ci
-
-      - name: Stop Docker environment
-        run: npm run env:stop
-        if: always()
-        env:
-          COMPOSE_INTERACTIVE_]NO_CLI: true
-
       - name: Lint JS
         run: npm run lint:js
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -129,4 +129,4 @@ module.exports = function( grunt ) {
 
 	grunt.util.linefeed = '\n';
 
-};
+};
diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 **Requires at least:** 4.4  
 **Requires PHP:** 5.4  
 **Tested up to:** 6.5  
-**Stable tag:** 1.6.26  
+**Stable tag:** 1.6.27  
 **License:** GPLv2 or later  
 **License URI:** http://www.gnu.org/licenses/gpl-2.0.html  
 
@@ -140,6 +140,11 @@ This same applies when you are creating your Header/Footer using this plugin.
 
 ## Changelog ##
 
+### 1.6.27 ###
+- Improvement: Compatibility with latest Elementor and Elementor Pro 3.21 version.
+- Improvement: Compatibility with PHP 8.3 version.
+- Fix: This update addressed a security bug. Props to Wordfence.
+
 ### 1.6.26 ###
 - Improvement: Compatibility with latest Elementor and Elementor Pro 3.20 version.
 - Improvement: Compatibility with PHP 8.2 version.

diff --git a/admin/class-hfe-admin.php b/admin/class-hfe-admin.php
@@ -219,20 +219,20 @@ public function column_display_location_rules( $locations ) {
 	 */
 	public function header_footer_posttype() {
 		$labels = [
-			'name'               => __( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
-			'singular_name'      => __( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
-			'menu_name'          => __( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
-			'name_admin_bar'     => __( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
-			'add_new'            => __( 'Add New', 'header-footer-elementor' ),
-			'add_new_item'       => __( 'Add New Header or Footer', 'header-footer-elementor' ),
-			'new_item'           => __( 'New Template', 'header-footer-elementor' ),
-			'edit_item'          => __( 'Edit Template', 'header-footer-elementor' ),
-			'view_item'          => __( 'View Template', 'header-footer-elementor' ),
-			'all_items'          => __( 'All Templates', 'header-footer-elementor' ),
-			'search_items'       => __( 'Search Templates', 'header-footer-elementor' ),
-			'parent_item_colon'  => __( 'Parent Templates:', 'header-footer-elementor' ),
-			'not_found'          => __( 'No Templates found.', 'header-footer-elementor' ),
-			'not_found_in_trash' => __( 'No Templates found in Trash.', 'header-footer-elementor' ),
+			'name'               => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
+			'singular_name'      => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
+			'menu_name'          => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
+			'name_admin_bar'     => esc_html__( 'Elementor Header & Footer Builder', 'header-footer-elementor' ),
+			'add_new'            => esc_html__( 'Add New', 'header-footer-elementor' ),
+			'add_new_item'       => esc_html__( 'Add New Header or Footer', 'header-footer-elementor' ),
+			'new_item'           => esc_html__( 'New Template', 'header-footer-elementor' ),
+			'edit_item'          => esc_html__( 'Edit Template', 'header-footer-elementor' ),
+			'view_item'          => esc_html__( 'View Template', 'header-footer-elementor' ),
+			'all_items'          => esc_html__( 'All Templates', 'header-footer-elementor' ),
+			'search_items'       => esc_html__( 'Search Templates', 'header-footer-elementor' ),
+			'parent_item_colon'  => esc_html__( 'Parent Templates:', 'header-footer-elementor' ),
+			'not_found'          => esc_html__( 'No Templates found.', 'header-footer-elementor' ),
+			'not_found_in_trash' => esc_html__( 'No Templates found in Trash.', 'header-footer-elementor' ),
 		];
 
 		$args = [
@@ -292,7 +292,7 @@ function ehf_register_metabox() {
 	 */
 	function efh_metabox_render( $post ) {
 		$values            = get_post_custom( $post->ID );
-		$template_type     = isset( $values['ehf_template_type'] ) ? esc_attr( $values['ehf_template_type'][0] ) : '';
+		$template_type     = isset( $values['ehf_template_type'] ) ? esc_attr( sanitize_text_field( $values['ehf_template_type'][0] ) ) : '';
 		$display_on_canvas = isset( $values['display-on-canvas-template'] ) ? true : false;
 
 		// We'll use this nonce field later on when saving.
@@ -448,8 +448,8 @@ public function ehf_save_meta( $post_id ) {
 			return;
 		}
 
-		$target_locations = Astra_Target_Rules_Fields::get_format_rule_value( $_POST, 'bsf-target-rules-location' );
-		$target_exclusion = Astra_Target_Rules_Fields::get_format_rule_value( $_POST, 'bsf-target-rules-exclusion' );
+		$target_locations = array_map( 'sanitize_text_field', Astra_Target_Rules_Fields::get_format_rule_value( $_POST, 'bsf-target-rules-location' ) );
+		$target_exclusion = array_map( 'sanitize_text_field', Astra_Target_Rules_Fields::get_format_rule_value( $_POST, 'bsf-target-rules-exclusion' ) );
 		$target_users     = [];
 
 		if ( isset( $_POST['bsf-target-rules-users'] ) ) {
@@ -491,8 +491,8 @@ public function location_notice() {
 
 			// Check if more than one template is selected for current template type.
 			if ( is_array( $templates ) && isset( $templates[1] ) && $post->ID != $templates[0] ) {
-				$post_title        = '<strong>' . get_the_title( $templates[0] ) . '</strong>';
-				$template_location = '<strong>' . $this->template_location( $template_type ) . '</strong>';
+				$post_title        = '<strong>' . esc_html( get_the_title( $templates[0] ) ) . '</strong>';
+				$template_location = '<strong>' . esc_html( $this->template_location( $template_type ) ) . '</strong>';
 				/* Translators: Post title, Template Location */
 				$message = sprintf( __( 'Template %1$s is already assigned to the location %2$s', 'header-footer-elementor' ), $post_title, $template_location );
 

diff --git a/header-footer-elementor.php b/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.26
- * Elementor tested up to: 3.20
- * Elementor Pro tested up to: 3.20
+ * Version: 1.6.27
+ * Elementor tested up to: 3.21
+ * Elementor Pro tested up to: 3.21
  *
  * @package         header-footer-elementor
  */
 
-define( 'HFE_VER', '1.6.26' );
+define( 'HFE_VER', '1.6.27' );
 define( 'HFE_FILE', __FILE__ );
 define( 'HFE_DIR', plugin_dir_path( __FILE__ ) );
 define( 'HFE_URL', plugins_url( '/', __FILE__ ) );

diff --git a/inc/widgets-manager/widgets/class-page-title.php b/inc/widgets-manager/widgets/class-page-title.php
@@ -491,7 +491,7 @@ protected function content_template() {
 			<# if ( '' != settings.page_heading_link.url ) { #>
 					<a {{{ view.getRenderAttributeString( 'url' ) }}} > <?php // PHPCS:Ignore WordPressVIPMinimum.Security.Mustache.OutputNotation ?>
 			<# } #>
-			<{{{ headingSizeTag }}} class="elementor-heading-title elementor-size-{{{ settings.size }}}"> <?php //phpcs:ignore WordPressVIPMinimum.Security.Mustache.OutputNotation ?>		
+			<{{{ headingSizeTag }}} class="elementor-heading-title elementor-size-<?php echo isset( $settings['size'] ) ? esc_attr( $settings['size'] ) : '{{{ settings.size }}}'; ?>"> <?php //phpcs:ignore WordPressVIPMinimum.Security.Mustache.OutputNotation ?>
 				<# if( '' != settings.new_page_title_select_icon.value ){ #>
 					<span class="hfe-page-title-icon" data-elementor-setting-key="page_title" data-elementor-inline-editing-toolbar="basic">
 						{{{iconHTML.value}}} <?php // PHPCS:Ignore WordPressVIPMinimum.Security.Mustache.OutputNotation ?>                    

diff --git a/languages/header-footer-elementor.pot b/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.26\n"
+"Project-Id-Version: Elementor Header & Footer Builder 1.6.27\n"
 "Report-Msgid-Bugs-To: "
 "https://wordpress.org/support/plugin/header-footer-elementor\n"
-"POT-Creation-Date: 2024-03-07 04:53:47+00:00\n"
+"POT-Creation-Date: 2024-04-15 08:11:23+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -129,4 +129,4 @@ module.exports = function( grunt ) {

		grunt.util.linefeed = '\n';

		};
		};