From e08e0be1275c4f906c1e5996283af86ce272ee39 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Tue, 25 Jun 2024 18:17:08 +0530 Subject: [PATCH 01/12] Heading module --- classes/class-uabb-wpml.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/classes/class-uabb-wpml.php b/classes/class-uabb-wpml.php index 742d822b..eb644552 100644 --- a/classes/class-uabb-wpml.php +++ b/classes/class-uabb-wpml.php @@ -177,6 +177,27 @@ static public function wpml_uabb_modules_translate( $form ) { ), ), ); + // Heading Module. + $form['uabb-heading'] = array( + 'conditions' => array( 'type' => 'uabb-heading' ), + 'fields' => array( + array( + 'field' => 'heading', + 'type' => __( 'Heading : Heading', 'uabb' ), + 'editor_type' => 'LINE', + ), + array( + 'field' => 'link', + 'type' => __( 'Link', 'uabb' ), + 'editor_type' => 'LINK', + ), + array( + 'field' => 'description', + 'type' => __( 'Heading : Description', 'uabb' ), + 'editor_type' => 'LINE', + ), + ), + ); return $form; } From aafd5a2bf34e5c29a4c2e59dd21088f360e0b1ba Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:58:30 +0530 Subject: [PATCH 02/12] Updated type name --- classes/class-uabb-wpml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/class-uabb-wpml.php b/classes/class-uabb-wpml.php index eb644552..3859a734 100644 --- a/classes/class-uabb-wpml.php +++ b/classes/class-uabb-wpml.php @@ -183,7 +183,7 @@ static public function wpml_uabb_modules_translate( $form ) { 'fields' => array( array( 'field' => 'heading', - 'type' => __( 'Heading : Heading', 'uabb' ), + 'type' => __( 'Heading : Heading Text', 'uabb' ), 'editor_type' => 'LINE', ), array( @@ -193,7 +193,7 @@ static public function wpml_uabb_modules_translate( $form ) { ), array( 'field' => 'description', - 'type' => __( 'Heading : Description', 'uabb' ), + 'type' => __( 'Heading : Description Text', 'uabb' ), 'editor_type' => 'LINE', ), ), From bdc7990d6caba0f7827b3c1693292b5a507f3f84 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Wed, 26 Jun 2024 11:01:16 +0530 Subject: [PATCH 03/12] type name updated --- classes/class-uabb-wpml.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/class-uabb-wpml.php b/classes/class-uabb-wpml.php index 3859a734..5cba3b8c 100644 --- a/classes/class-uabb-wpml.php +++ b/classes/class-uabb-wpml.php @@ -183,7 +183,7 @@ static public function wpml_uabb_modules_translate( $form ) { 'fields' => array( array( 'field' => 'heading', - 'type' => __( 'Heading : Heading Text', 'uabb' ), + 'type' => __( 'Heading Text', 'uabb' ), 'editor_type' => 'LINE', ), array( @@ -193,7 +193,7 @@ static public function wpml_uabb_modules_translate( $form ) { ), array( 'field' => 'description', - 'type' => __( 'Heading : Description Text', 'uabb' ), + 'type' => __( 'Description Text', 'uabb' ), 'editor_type' => 'LINE', ), ), From d74a9e03e67560ea4c34a1631885cbd55a70d57f Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:20:15 +0530 Subject: [PATCH 04/12] Ribbon module --- classes/class-uabb-wpml.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/classes/class-uabb-wpml.php b/classes/class-uabb-wpml.php index 5cba3b8c..aa7507ca 100644 --- a/classes/class-uabb-wpml.php +++ b/classes/class-uabb-wpml.php @@ -199,6 +199,18 @@ static public function wpml_uabb_modules_translate( $form ) { ), ); + // Ribbon. + $form['ribbon'] = array( + 'conditions' => array( 'type' => 'ribbon' ), + 'fields' => array( + array( + 'field' => 'title', + 'type' => __( 'Ribbon Message', 'uabb' ), + 'editor_type' => 'LINE', + ), + ), + ); + return $form; } } From adc49366fdc6e5089a3756c73cff0d56ecd64c35 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:28:25 +0530 Subject: [PATCH 05/12] Added Changelog --- readme.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/readme.txt b/readme.txt index e6b5a593..f8a762ff 100644 --- a/readme.txt +++ b/readme.txt @@ -215,6 +215,9 @@ Yes it is! This plugin comes with .po and .mo files. It is already translated in == Changelog == += 1.5.9 = +* Improvement: WPML compatibility for the Heading and Ribbon module. + = 1.5.8 = * Improvement: This update addressed a security bug. Props to Patchstack for privately reporting it to our team. * Fixed: Info List - Undefined variable issue with PHP 8. From 6063e0b35de2533506b5ba8e5d13b6534aa67f5a Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:29:45 +0530 Subject: [PATCH 06/12] grunt readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index f2be74bf..66bf2caa 100644 --- a/README.md +++ b/README.md @@ -215,6 +215,9 @@ Yes it is! This plugin comes with .po and .mo files. It is already translated in ## Changelog ## +### 1.5.9 ### +* Improvement: WPML compatibility for the Heading and Ribbon module. + ### 1.5.8 ### * Improvement: This update addressed a security bug. Props to Patchstack for privately reporting it to our team. * Fixed: Info List - Undefined variable issue with PHP 8. From 53199b14f858d5a5d55df36a5553c32eeae4992a Mon Sep 17 00:00:00 2001 From: Akshay Urankar Date: Thu, 27 Jun 2024 12:49:38 +0530 Subject: [PATCH 07/12] sanitized widgets for security --- modules/image-icon/includes/frontend.php | 4 ++-- modules/image-separator/includes/frontend.php | 2 +- .../info-list/info-list-bb-less-than-2-2-compatibility.php | 1 + modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php | 1 + modules/uabb-star-rating/includes/frontend.php | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/image-icon/includes/frontend.php b/modules/image-icon/includes/frontend.php index 6a7f9c33..c6fee9e4 100644 --- a/modules/image-icon/includes/frontend.php +++ b/modules/image-icon/includes/frontend.php @@ -12,7 +12,7 @@ image_type ) { ?> - + @@ -30,7 +30,7 @@ ?> " itemscope itemtype="http://schema.org/ImageObject">
- <?php echo $alt; ?> + <?php echo esc_attr($alt); ?>
diff --git a/modules/image-separator/includes/frontend.php b/modules/image-separator/includes/frontend.php index 96e96d56..a3268729 100644 --- a/modules/image-separator/includes/frontend.php +++ b/modules/image-separator/includes/frontend.php @@ -19,6 +19,6 @@ echo ' uabb-image-crop-' . $settings->image_style;} ?> " itemscope itemtype="http://schema.org/ImageObject"> - <?php echo $alt; ?> + <?php echo esc_attr($alt); ?> diff --git a/modules/info-list/info-list-bb-less-than-2-2-compatibility.php b/modules/info-list/info-list-bb-less-than-2-2-compatibility.php index 40b5102f..149da05f 100644 --- a/modules/info-list/info-list-bb-less-than-2-2-compatibility.php +++ b/modules/info-list/info-list-bb-less-than-2-2-compatibility.php @@ -233,6 +233,7 @@ 'type' => 'select', 'label' => __( 'Select Tag', 'uabb' ), 'default' => 'h3', + 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h4' ), 'options' => array( 'h1' => __( 'H1', 'uabb' ), 'h2' => __( 'H2', 'uabb' ), diff --git a/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php b/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php index 12922554..d6744714 100644 --- a/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php +++ b/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php @@ -177,6 +177,7 @@ 'type' => 'select', 'label' => __( 'Tag', 'uabb' ), 'default' => 'h3', + 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h3' ), 'options' => array( 'h1' => __( 'H1', 'uabb' ), 'h2' => __( 'H2', 'uabb' ), diff --git a/modules/uabb-star-rating/includes/frontend.php b/modules/uabb-star-rating/includes/frontend.php index 1992763f..6974e169 100644 --- a/modules/uabb-star-rating/includes/frontend.php +++ b/modules/uabb-star-rating/includes/frontend.php @@ -14,7 +14,7 @@ star_position ) { ?> -
+
@@ -47,7 +47,7 @@ star_position ) { ?> -
+
From e943dfff4fcee61955eb842705d5b8dd88a822e3 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:00:22 +0530 Subject: [PATCH 08/12] added space --- modules/image-icon/includes/frontend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/image-icon/includes/frontend.php b/modules/image-icon/includes/frontend.php index c6fee9e4..bf7e469c 100644 --- a/modules/image-icon/includes/frontend.php +++ b/modules/image-icon/includes/frontend.php @@ -12,7 +12,7 @@ image_type ) { ?> - + From 5113a63276086bd6d25a02e36f77fcb5f53dec01 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:11:39 +0530 Subject: [PATCH 09/12] updated code --- modules/info-list/info-list-bb-less-than-2-2-compatibility.php | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/info-list/info-list-bb-less-than-2-2-compatibility.php b/modules/info-list/info-list-bb-less-than-2-2-compatibility.php index 149da05f..40b5102f 100644 --- a/modules/info-list/info-list-bb-less-than-2-2-compatibility.php +++ b/modules/info-list/info-list-bb-less-than-2-2-compatibility.php @@ -233,7 +233,6 @@ 'type' => 'select', 'label' => __( 'Select Tag', 'uabb' ), 'default' => 'h3', - 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h4' ), 'options' => array( 'h1' => __( 'H1', 'uabb' ), 'h2' => __( 'H2', 'uabb' ), From 47cea30abb77540f203e47e640c5d22d951e814f Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:19:03 +0530 Subject: [PATCH 10/12] html tag sanitize check --- modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php | 1 - modules/uabb-heading/uabb-heading-bb-2-2-compatibility.php | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php b/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php index d6744714..12922554 100644 --- a/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php +++ b/modules/ribbon/ribbon-bb-less-than-2-2-compatibility.php @@ -177,7 +177,6 @@ 'type' => 'select', 'label' => __( 'Tag', 'uabb' ), 'default' => 'h3', - 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h3' ), 'options' => array( 'h1' => __( 'H1', 'uabb' ), 'h2' => __( 'H2', 'uabb' ), diff --git a/modules/uabb-heading/uabb-heading-bb-2-2-compatibility.php b/modules/uabb-heading/uabb-heading-bb-2-2-compatibility.php index 0b60d593..07140a4f 100644 --- a/modules/uabb-heading/uabb-heading-bb-2-2-compatibility.php +++ b/modules/uabb-heading/uabb-heading-bb-2-2-compatibility.php @@ -315,6 +315,7 @@ 'type' => 'select', 'label' => __( 'HTML Tag', 'uabb' ), 'default' => 'h3', + 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h3' ), 'options' => array( 'h1' => 'h1', 'h2' => 'h2', From 0b675f86688ca1ae4d47b990fd28d7f766781d28 Mon Sep 17 00:00:00 2001 From: Vijeta Raikar <110518282+vijetaR@users.noreply.github.com> Date: Thu, 27 Jun 2024 17:20:49 +0530 Subject: [PATCH 11/12] html tag check --- .../uabb-heading/uabb-heading-bb-less-than-2-2-compatibility.php | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/uabb-heading/uabb-heading-bb-less-than-2-2-compatibility.php b/modules/uabb-heading/uabb-heading-bb-less-than-2-2-compatibility.php index 8e618ddf..fa75bde9 100644 --- a/modules/uabb-heading/uabb-heading-bb-less-than-2-2-compatibility.php +++ b/modules/uabb-heading/uabb-heading-bb-less-than-2-2-compatibility.php @@ -325,6 +325,7 @@ 'type' => 'select', 'label' => __( 'HTML Tag', 'uabb' ), 'default' => 'h3', + 'sanitize' => array( 'FLBuilderUtils::esc_tags', 'h3' ), 'options' => array( 'h1' => 'h1', 'h2' => 'h2', From ed995749ba13b7dbfe33461b62f65f89ebdf5b8a Mon Sep 17 00:00:00 2001 From: Akshay Urankar Date: Fri, 28 Jun 2024 11:20:06 +0530 Subject: [PATCH 12/12] changed version number --- README.md | 5 ++++- bb-ultimate-addon.php | 4 ++-- readme.txt | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index f2be74bf..593f1e41 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ **Tags:** beaver builder, beaver builder free, beaver addons, beaver builder addon, beaver builder add ons, beaver builder lite, beaver builder modules, beaver builder addons, beaver builder extensions, beaver addon, beaver builder plugin, beaver builder wordpress **Requires at least:** 4.6 **Tested up to:** 6.5 -**Stable tag:** 1.5.8 +**Stable tag:** 1.5.9 **License:** GPLv2 or later **License URI:** https://www.gnu.org/licenses/gpl-2.0.html @@ -215,6 +215,9 @@ Yes it is! This plugin comes with .po and .mo files. It is already translated in ## Changelog ## +### 1.5.9 ### +* Improvement: Improved codebase for improved security. + ### 1.5.8 ### * Improvement: This update addressed a security bug. Props to Patchstack for privately reporting it to our team. * Fixed: Info List - Undefined variable issue with PHP 8. diff --git a/bb-ultimate-addon.php b/bb-ultimate-addon.php index e881f0f8..93cf1327 100644 --- a/bb-ultimate-addon.php +++ b/bb-ultimate-addon.php @@ -3,7 +3,7 @@ * Plugin Name: Ultimate Addons for Beaver Builder - Lite * Plugin URI: http://www.ultimatebeaver.com/ * Description: Ultimate Addons is a free extension for Beaver Builder that adds 10 modules, and works on top of any Beaver Builder Package. (Free, Standard, Pro & Agency) You can use it with on any WordPress theme. - * Version: 1.5.8 + * Version: 1.5.9 * Author: Brainstorm Force * Author URI: http://www.brainstormforce.com * Text Domain: uabb @@ -18,7 +18,7 @@ define( 'BB_ULTIMATE_ADDON_DIR', plugin_dir_path( __FILE__ ) ); define( 'BB_ULTIMATE_ADDON_URL', plugins_url( '/', __FILE__ ) ); - define( 'BB_ULTIMATE_ADDON_LITE_VERSION', '1.5.8' ); + define( 'BB_ULTIMATE_ADDON_LITE_VERSION', '1.5.9' ); define( 'BSF_REMOVE_UABB_FROM_REGISTRATION_LISTING', true ); define( 'BB_ULTIMATE_ADDON_FILE', trailingslashit( dirname( __FILE__ ) ) . 'bb-ultimate-addon.php' );// @codingStandardsIgnoreLine. define( 'BB_ULTIMATE_ADDON_LITE', true ); diff --git a/readme.txt b/readme.txt index e6b5a593..3ef86b8c 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Donate link: https://www.paypal.me/BrainstormForce Tags: beaver builder, beaver builder free, beaver addons, beaver builder addon, beaver builder add ons, beaver builder lite, beaver builder modules, beaver builder addons, beaver builder extensions, beaver addon, beaver builder plugin, beaver builder wordpress Requires at least: 4.6 Tested up to: 6.5 -Stable tag: 1.5.8 +Stable tag: 1.5.9 License: GPLv2 or later License URI: https://www.gnu.org/licenses/gpl-2.0.html @@ -215,6 +215,9 @@ Yes it is! This plugin comes with .po and .mo files. It is already translated in == Changelog == += 1.5.9 = +* Improvement: Improved codebase for improved security. + = 1.5.8 = * Improvement: This update addressed a security bug. Props to Patchstack for privately reporting it to our team. * Fixed: Info List - Undefined variable issue with PHP 8.