tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: esc_attibutes on theme helper print blocks to related items list

This commit is contained in:
vnmedeiros 2022-09-01 11:19:52 -03:00
parent e6f64beeee
commit 35d0ceba8a
1 changed files with 35 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/classes/theme-helper/class-tainacan-theme-helper.php
View File

@ -937,7 +937,9 @@ class Theme_Helper {
'auto_play_speed' => 3, 'auto_play_speed' => 3,
'loop_slides' => false, 'loop_slides' => false,
'hide_title' => false, 'hide_title' => false,
'image_size' => 'tainacan-medium', 'image_size' => ( isset($args['crop_images_to_square']) && !$args['crop_images_to_square'] )
? 'tainacan-medium-full'
: 'tainacan-medium',
'show_collection_header' => false, 'show_collection_header' => false,
'show_collection_label' => false, 'show_collection_label' => false,
'collection_background_color' => '#454647', 'collection_background_color' => '#454647',
@ -947,12 +949,6 @@ class Theme_Helper {
'class_name' => '' 'class_name' => ''
); );
$args = wp_parse_args($args, $defaults); $args = wp_parse_args($args, $defaults);
/* Compatibility with previous version */
if ( isset($args['crop_images_to_square ']) && !$args['crop_images_to_square'] ) {
$args['image_size'] = 'tainacan-medium-full';
}
$props = ' '; $props = ' ';
// Always pass the class needed by Vue to mount the component; // Always pass the class needed by Vue to mount the component;
@ -960,22 +956,15 @@ class Theme_Helper {
unset($args['class_name']); unset($args['class_name']);
// Builds parameters to the html div rendered by Vue // Builds parameters to the html div rendered by Vue
$allowed_html = [
'div' => [
'data-module' => true,
'id' => true
]
];
foreach ($args as $key => $value) { foreach ($args as $key => $value) {
if (is_bool($value)) if (is_bool($value))
$value = $value ? 'true' : 'false'; $value = $value ? 'true' : 'false';
// Changes from PHP '_' notation to HTML '-' notation // Changes from PHP '_' notation to HTML '-' notation
$key_attr = str_replace('_', '-', $key); $key_attr = str_replace('_', '-', $key);
$props .= "$key_attr='$value' "; $props .= sprintf("%s='%s' ", $key_attr, esc_attr($value));
$allowed_html['div'][$key_attr] = true;
} }
return wp_kses( "<div data-module='carousel-items-list' id='tainacan-items-carousel-shortcode_" . uniqid() . "' $props ></div>", $allowed_html); return "<div data-module='carousel-items-list' id='tainacan-items-carousel-shortcode_" . uniqid() . "' $props ></div>";
} }
/** /**
@ -1020,7 +1009,9 @@ class Theme_Helper {
'show_name' => true, 'show_name' => true,
'show_image' => true, 'show_image' => true,
'layout' => 'grid', 'layout' => 'grid',
'image_size' => 'tainacan-medium', 'image_size' => ( isset($args['crop_images_to_square']) && !$args['crop_images_to_square'] )
? 'tainacan-medium-full'
: 'tainacan-medium',
'show_collection_header' => false, 'show_collection_header' => false,
'show_collection_label' => false, 'show_collection_label' => false,
'collection_background_color' => '#454647', 'collection_background_color' => '#454647',
@ -1036,36 +1027,22 @@ class Theme_Helper {
'mosaic_item_focal_point_y' => 0.5 'mosaic_item_focal_point_y' => 0.5
); );
$args = wp_parse_args($args, $defaults); $args = wp_parse_args($args, $defaults);
/* Compatibility with previous version */
if ( isset($args['crop_images_to_square ']) && !$args['crop_images_to_square'] ) {
$args['image_size'] = 'tainacan-medium-full';
}
$props = ' '; $props = ' ';
// Always pass the class needed by Vue to mount the component; // Always pass the class needed by Vue to mount the component;
$args['class'] = $args['class_name'] . ' wp-block-tainacan-dynamic-items-list'; $args['class'] = $args['class_name'] . ' wp-block-tainacan-dynamic-items-list';
unset($args['class_name']); unset($args['class_name']);
// Builds parameters to the html div rendered by Vue
$allowed_html = [
'div' => [
'data-module' => true,
"id" => true
]
];
// Builds parameters to the html div rendered by Vue // Builds parameters to the html div rendered by Vue
foreach ($args as $key => $value) { foreach ($args as $key => $value) {
if (is_bool($value)) if (is_bool($value))
$value = $value ? 'true' : 'false'; $value = $value ? 'true' : 'false';
// Changes from PHP '_' notation to HTML '-' notation // Changes from PHP '_' notation to HTML '-' notation
$key_attr = str_replace('_', '-', $key); $key_attr = str_replace('_', '-', $key);
$props .= "$key_attr='$value' "; $props .= sprintf("%s='%s' ", $key_attr, esc_attr($value));
$allowed_html['div'][$key_attr] = true;
} }
return wp_kses("<div data-module='dynamic-items-list' id='tainacan-dynamic-items-list-shortcode_" . uniqid(). "' $props ></div>", $allowed_html); return "<div data-module='dynamic-items-list' id='tainacan-dynamic-items-list-shortcode_" . uniqid(). "' $props ></div>";
} }
/** /**
@ -1130,13 +1107,32 @@ class Theme_Helper {
$items_list_div = ''; $items_list_div = '';
if ( isset($related_group['collection_id']) ) { if ( isset($related_group['collection_id']) ) {
$block_args = (isset($args['items_list_layout']) && $args['items_list_layout'] !== 'carousel' )
? $args['dynamic_items_args']
: $args['carousel_args'];
$no_crop_images_to_square = isset($block_args['crop_images_to_square']) && !$block_args['crop_images_to_square'];
$image_size = isset($block_args['image_size'])
? $block_args['image_size']
: ($no_crop_images_to_square ? 'tainacan-medium-full' : 'tainacan-medium');
// remove attribute description and unused thumbnails image sizes, to avoid poluting HTML
$related_group['items'] = array_map(
function($el) use ($image_size) {
$el['thumbnail'] = array_filter($el['thumbnail'], function($key) use ($image_size) {
return $key == $image_size;
}, ARRAY_FILTER_USE_KEY);
unset($el['description']);
return $el;
}, $related_group['items']
);
if ( isset($args['items_list_layout']) && $args['items_list_layout'] !== 'carousel' ) { if ( isset($args['items_list_layout']) && $args['items_list_layout'] !== 'carousel' ) {
$items_list_args = wp_parse_args([ $items_list_args = wp_parse_args([
'collection_id' => $related_group['collection_id'], 'collection_id' => $related_group['collection_id'],
'load_strategy' => 'parent', 'load_strategy' => 'parent',
'selected_items' => json_encode($related_group['items']), 'selected_items' => json_encode($related_group['items']),
'layout' => $args['items_list_layout'] 'layout' => $args['items_list_layout']
], $args['dynamic_items_args']); ], $block_args);
$items_list_div = $this->get_tainacan_dynamic_items_list($items_list_args); $items_list_div = $this->get_tainacan_dynamic_items_list($items_list_args);
} else { } else {
@ -1144,7 +1140,7 @@ class Theme_Helper {
'collection_id' => $related_group['collection_id'], 'collection_id' => $related_group['collection_id'],
'load_strategy' => 'parent', 'load_strategy' => 'parent',
'selected_items' => json_encode($related_group['items']) 'selected_items' => json_encode($related_group['items'])
], $args['carousel_args']); ], $block_args);
$items_list_div = $this->get_tainacan_items_carousel($items_list_args); $items_list_div = $this->get_tainacan_items_carousel($items_list_args);
} }