| @@ -5,9 +5,9 @@ | ||
| 5 | 5 | exit; |
| 6 | 6 | } |
| 7 | 7 | |
| 8 | 8 | use ABlocks\Classes\BlockBaseAbstract; |
| 9 | -use ABlocks\Classes\CssGenerator; | |
| 9 | +use ABlocks\Classes\CssGeneratorV2; | |
| 10 | 10 | use ABlocks\Helper; |
| 11 | 11 | use ABlocks\Controls\Typography; |
| 12 | 12 | use ABlocks\Controls\Background; |
| 13 | 13 | use ABlocks\Controls\Border; |
| @@ -16,9 +16,9 @@ | ||
| 16 | 16 | class Block extends BlockBaseAbstract { |
| 17 | 17 | protected $block_name = 'academy-pdf'; |
| 18 | 18 | |
| 19 | 19 | public function build_css( $attributes ) { |
| 20 | - $css_generator = new CssGenerator( $attributes ); | |
| 20 | + $css_generator = new CssGeneratorV2( $attributes, $this->block_name ); | |
| 21 | 21 | |
| 22 | 22 | return $css_generator->generate_css(); |
| 23 | 23 | } |
| 24 | 24 | |
| @@ -25,13 +25,14 @@ | ||
| 25 | 25 | |
| 26 | 26 | |
| 27 | 27 | public function render_block_content( $attributes, $content, $block_instance ) { |
| 28 | 28 | $attr_array = [ |
| 29 | - 'src' => Helper::get_attribute_value( $attributes, 'src' ), | |
| 30 | - 'width' => Helper::get_attribute_value( $attributes, 'width' ), | |
| 31 | - 'height' => Helper::get_attribute_value( $attributes, 'height' ), | |
| 29 | + 'src' => esc_url_raw( Helper::get_attribute_value( $attributes, 'src' ) ), | |
| 30 | + 'width' => sanitize_text_field( Helper::get_attribute_value( $attributes, 'width' ) ), | |
| 31 | + 'height' => sanitize_text_field( Helper::get_attribute_value( $attributes, 'height' ) ), | |
| 32 | 32 | ]; |
| 33 | - $shortcode = '[academy_pdf ' . Helper::attr_shortcode( $attr_array ) . ']'; | |
| 33 | + $shortcode = '[academy_pdf ' . Helper::attr_shortcode( $attr_array ) . ']'; | |
| 34 | 34 | echo do_shortcode( $shortcode ); |
| 35 | 35 | } |
| 36 | + | |
| 36 | 37 | |
| 37 | 38 | } |