Skip to content

Commit

Permalink
version update
Browse files Browse the repository at this point in the history
  • Loading branch information
rlankhorst committed Apr 29, 2024
1 parent 5f5d86a commit 1b84804
Show file tree
Hide file tree
Showing 369 changed files with 259 additions and 221 deletions.
1 change: 1 addition & 0 deletions DNSMPD/class-DNSMPD.php
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public function datarequest_options( array $options = [] ): array {
],

];

return $options;
}

Expand Down
3 changes: 3 additions & 0 deletions DNSMPD/class-admin-DNSMPD.php
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,9 @@ public function update_db_check() {
`global_optout` int(11) NOT NULL,
`cross_context` int(11) NOT NULL,
`limit_sensitive` int(11) NOT NULL,
`request_for_access` int(11) NOT NULL,
`right_to_be_forgotten` int(11) NOT NULL,
`right_to_data_portability` int(11) NOT NULL,
`request_date` int(11) NOT NULL,
`resolved` int(11) NOT NULL,
PRIMARY KEY (ID)
Expand Down
40 changes: 20 additions & 20 deletions assets/css/admin.css
Original file line number Diff line number Diff line change
Expand Up @@ -1001,83 +1001,83 @@ button.button .cmplz-icon.cmplz-icon-loading > div {
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(1) {
width: 67%;
width: 97%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(2) {
width: 84%;
width: 82%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(3) {
width: 87%;
width: 73%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(4) {
width: 61%;
width: 74%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(5) {
width: 84%;
width: 99%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(6) {
width: 98%;
width: 87%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(7) {
width: 94%;
width: 84%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(8) {
width: 72%;
width: 74%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(9) {
width: 61%;
width: 72%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(10) {
width: 85%;
width: 89%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(11) {
width: 72%;
width: 69%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(12) {
width: 94%;
width: 88%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(13) {
width: 85%;
width: 61%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(14) {
width: 71%;
width: 67%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(15) {
width: 82%;
width: 89%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(16) {
width: 65%;
width: 76%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(17) {
width: 93%;
width: 98%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(18) {
width: 93%;
width: 97%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(19) {
width: 72%;
width: 97%;
}

.cmplz-placeholder .cmplz-placeholder-line:nth-of-type(20) {
width: 77%;
width: 65%;
}

.cmplz-placeholder .cmplz-placeholder-line ~ .cmplz-placeholder-line {
Expand Down
2 changes: 1 addition & 1 deletion assets/css/admin.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion assets/css/rtl/admin.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions class-cookie-blocker.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function delete_cookies(){
setcookie($name, "", -1, '/' );
}
}

/**
* Sanitize cookie name. Remove any characters that are not alphanumeric, underscore, or dash to prevent fatal errors in the setcookie function
*
Expand Down Expand Up @@ -878,7 +878,7 @@ private function replace_src( $script, $new_src ) {
*/

private function replace_href( $link ) {
return str_replace( 'href=', 'href="#" data-href=', $link );
return str_replace( 'href=', 'data-href=', $link );
}

/**
Expand Down
4 changes: 2 additions & 2 deletions complianz-gpdr.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: Complianz | GDPR/CCPA Cookie Consent
* Plugin URI: https://www.wordpress.org/plugins/complianz-gdpr
* Description: Complianz Privacy Suite for GDPR, CaCPA, DSVGO, AVG with a conditional cookie warning and customized cookie policy
* Version: 7.0.4
* Version: 7.0.5
* Requires at least: 5.9
* Requires PHP: 7.2
* Text Domain: complianz-gdpr
Expand Down Expand Up @@ -135,7 +135,7 @@ private function setup_constants() {
//for auto upgrade functionality
define( 'cmplz_plugin_free', plugin_basename( __FILE__ ) );
$debug = (defined('SCRIPT_DEBUG') && SCRIPT_DEBUG) ? '#'.time() : '';
define( 'cmplz_version', '7.0.4' . $debug );
define( 'cmplz_version', '7.0.5' . $debug );
define( 'cmplz_plugin_file', __FILE__ );
}

Expand Down
4 changes: 3 additions & 1 deletion cookiebanner/class-banner-loader.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function __construct() {
}

self::$_this = $this;
if ( ! is_admin() ) {
if ( ! is_admin() && !cmplz_is_pagebuilder_preview() ) {
if ( get_option( 'cmplz_wizard_completed_once' ) && $this->site_needs_cookie_warning() ) {
add_action( 'wp_print_footer_scripts', array( $this, 'inline_cookie_script' ), PHP_INT_MAX - 50 );
add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ), PHP_INT_MAX - 50 );
Expand Down Expand Up @@ -322,6 +322,8 @@ public function cookiebanner_css() {
* Load the cookie banner html for each consenttype
*/
public function cookiebanner_html() {


global $post;
$type = '';
if ( $post && ( $post->ID ?? false ) ) {
Expand Down
2 changes: 1 addition & 1 deletion cookiebanner/class-cookiebanner.php
Original file line number Diff line number Diff line change
Expand Up @@ -1017,7 +1017,7 @@ public function get_banner_logo($all_variants = false )
public function get_html_settings() {
$output = array(
'id' => $this->ID,
'title_class' => strtolower( str_replace(' ' , '-', $this->title) ),
'title_class' => sanitize_title($this->title),
'logo' => $this->get_banner_logo(),
'header' => $this->header_x,
'accept_optin' => $this->accept_x,
Expand Down
6 changes: 2 additions & 4 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -1253,7 +1253,7 @@ function cmplz_is_pagebuilder_preview() {
|| isset( $_GET['tatsu'] ) //tatsu
|| isset( $_GET['tatsu-header'] ) //tatsu
|| isset( $_GET['tatsu-footer'] ) //tatsu
|| ( isset( $_GET['action'] ) && $_GET['action'] === 'ms_get_preview' ) //meta slider
|| ( isset( $_GET['action'] ) && $_GET['action'] === 'ms_get_preview' ) //meta slider
|| strpos( $_SERVER['REQUEST_URI'], 'cornerstone/edit') !== false
) {
$preview = true;
Expand All @@ -1268,7 +1268,6 @@ function cmplz_is_pagebuilder_preview() {
if (isset($_GET['context']) && $_GET['context']==='edit') {
return true;
}

return apply_filters( 'cmplz_is_preview', $preview );
}
}
Expand Down Expand Up @@ -2208,8 +2207,7 @@ function cmplz_register_translation( $string, $fieldname ) {
icl_register_string( 'complianz', $fieldname, $string );
}

do_action( 'wpml_register_single_string', 'complianz', $fieldname,
$string );
do_action( 'wpml_register_single_string', 'complianz', $fieldname, $string );

}
}
Expand Down
2 changes: 1 addition & 1 deletion gutenberg/block.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function cmplz_render_consent_area_block($attributes, $content)
$service = isset($attributes['service']) ? COMPLIANZ::$cookie_blocker->sanitize_service_name( $attributes['service'] ) : 'general';
$post_id = (int) $attributes['postId'];
$block_id = sanitize_title($attributes['blockId']);
$placholder_content = $attributes['placeholderContent'];
$placholder_content = $attributes['placeholderContent'] ?? '';
ob_start();
?><div class="cmplz-consent-area cmplz-placeholder" data-post_id="<?php echo esc_attr($post_id)?>" data-block_id="<?php echo esc_attr($block_id)?>" data-category="<?php echo esc_attr($category); ?>" data-service="<?php echo esc_attr($service); ?>">
<?php echo wp_kses_post($placholder_content) ?>
Expand Down
2 changes: 1 addition & 1 deletion onboarding/class-onboarding.php
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public function get_recommended_plugins_status($plugins){
*/
public function signup_for_mailinglist( string $email): void {
$license_key = '';
if ( defined('rsssl_pro_version') ) {
if ( defined('rsssl_pro') ) {
$license_key = COMPLIANZ::$license->license_key();
$license_key = COMPLIANZ::$license->maybe_decode( $license_key );
}
Expand Down
11 changes: 10 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Requires at least: 5.9
License: GPL2
Requires PHP: 7.2
Tested up to: 6.5
Stable tag: 7.0.4
Stable tag: 7.0.5

Configure your Cookie Banner, Cookie Consent and Cookie Policy with our Wizard and Cookie Scan.

Expand Down Expand Up @@ -185,6 +185,15 @@ The Brazilian General Data Protection Law is similar to the GDPR, the UK-GDPR it
With some custom CSS this is possible, but we do not consider a cookie wall to be GDPR compliant, so it's not actively supported. We do, however, have the option to create a Soft Cookie Wall. Which blocks interaction with the website, but dismissing remains a possibility.

== Changelog ==
= 7.0.5 =
* April 29th, 2024
* Fix: compatibility with Meta Slider plugin
* Fix: unexpected behaviour when editing a new, unsaved script block in the script center
* Fix: Detection of Really Simple SSL pro in other plugins section
* Fix: don't replace style src with #, as this reloads the entire page as style src, props @smerriman
* Fix: prefill administrator email in onboarding email
* Fix: undefined array key placeholderContent in Block Editor block

= 7.0.4 =
* March 9th, 2024
* Fix: Purposes were incorrectly set to 'disabled', while there should only be a condition limiting it to the US region only, props @cdhodgdon
Expand Down
1 change: 1 addition & 0 deletions settings/build/1027.f3f5161d37d76f6e83a7.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions settings/build/1030.93987b44e780a2ebb2e2.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
1 change: 0 additions & 1 deletion settings/build/1096.e353440dc401dd2cd45f.js

This file was deleted.

Loading

0 comments on commit 1b84804

Please sign in to comment.