← All changes | includes/Editors/BlockEditor/Blocks/FAQ.php +10 -70 4.9.2 → 3.8.9 View file →

		@@ -1,14 +1,9 @@
1	1	<?php
	2	+
2	3	namespace WPDeveloper\BetterDocs\Editors\BlockEditor\Blocks;
3	4
4		-if ( ! defined( 'ABSPATH' ) ) {
5		- exit;
6		-}
7		-
8		-
9	5	use WPDeveloper\BetterDocs\Editors\BlockEditor\Block;
10		-use WPDeveloper\BetterDocs\FrontEnd\WooProductFAQ as WooFAQRenderer;
11	6
12	7	class FAQ extends Block {
13	8	protected $editor_scripts = [
14	9	'betterdocs-faq',
		@@ -43,12 +38,9 @@
43	38	'blockRoot' => 'better_docs',
44	39	'blockMeta' => null,
45	40	'faqLayout' => 'layout-1',
46	41	'faqSectionText' => 'Frequently Asked Questions',
47		- 'faqSectionTitleTag' => 'h2',
48		- 'faqGroupTitleTag' => 'h3',
49	42	'faqSectionTitleColor' => null,
50		- // JSON string of `[{value:int, label:string}]`; a bare id array (`[5]`) is also accepted since 4.9.0.
51	43	'includeFaqGroup' => '',
52	44	'excludeFaqGroup' => '',
53	45	'faqGroupTitleColor' => null,
54	46	'faqGroupTitleHoverColor' => null,
		@@ -58,18 +50,13 @@
58	50	'faqGroupTitleTypography' => null,
59	51	'faqPerPage' => 9,
60	52
61	53	'showButtonIcon' => true,
62		- 'buttonColor' => '#528ffe',
63		- 'faqTaxonomy' => 'betterdocs_faq_category'
	54	+ 'buttonColor' => '#528ffe'
64	55	];
65	56	}
66	57
67	58	public function render( $attributes, $content ) {
68		- if ( ( $this->attributes['faqTaxonomy'] ?? '' ) === 'product_assignments' ) {
69		- $this->render_product_assignments();
70		- return;
71		- }
72	59
73	60	add_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10, 4 );
74	61	$this->views( 'layouts/faq' );
75	62	remove_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10 );
		@@ -74,66 +61,24 @@
74	61	$this->views( 'layouts/faq' );
75	62	remove_filter( 'betterdocs_header_layout_sequence', [ $this, 'header_sequence' ], 10 );
76	63	}
77	64
78		- private function render_product_assignments() {
79		- if ( ! class_exists( 'WooCommerce' ) || ! is_product() ) {
80		- return;
	65	+ public function get_groups_ids( $json ) {
	66	+ $data = json_decode( $json, true );
	67	+ $ids = '';
	68	+ if ( $data !== null ) {
	69	+ $ids = implode( ',', array_column( $data, 'value' ) );
81	70	}
82	71
83		- // In FSE templates, top-level blocks render outside the loop, so
84		- // get_the_ID() can be 0 — fall back to the queried product.
85		- $product_id = get_the_ID();
86		- if ( ! $product_id ) {
87		- $product_id = get_queried_object_id();
88		- }
89		- if ( ! $product_id ) {
90		- return;
91		- }
92		-
93		- /** @var WooFAQRenderer $renderer */
94		- $renderer = betterdocs()->container->get( WooFAQRenderer::class );
95		-
96		- // This block is the explicit placement; don't also inject into the tab/summary.
97		- $renderer->suppress_auto_placement();
98		- $renderer->render_for_product( $product_id, $this->attributes['faqLayout'] ?? null );
	72	+ return $ids;
99	73	}
100	74
101		- /**
102		- * Flatten a group-selection attribute into a comma separated list of term ids.
103		- *
104		- * The attribute is a JSON string. The editor writes
105		- * `[{"value":5,"label":"Install"}]`; REST clients and other programmatic
106		- * writers commonly write the bare form `[5]`. Both are accepted — before
107		- * 4.9.0 the bare form flattened to an empty string, which
108		- * `Query::faq_terms_query_args()` reads as "no filter", so every group
109		- * rendered and the block warned on every view.
110		- *
111		- * @since 4.9.0 Bare ids are accepted alongside `{ value, label }` objects;
112		- * ids are cast with `absint()` and de-duplicated.
113		- *
114		- * @param mixed $json JSON encoded list of term ids or `{ value, label }` objects.
115		- *
116		- * @return string Comma separated term ids, or '' when there is nothing to filter by.
117		- */
118		- public function get_groups_ids( $json ) {
119		- $data = is_string( $json ) ? json_decode( $json, true ) : $json;
120		- $ids = array_filter( self::normalize_id_list( $data ), 'is_numeric' );
121		- $ids = array_unique( array_map( 'absint', $ids ) );
122		-
123		- return implode( ',', $ids );
124		- }
125		-
126	75	public function view_params() {
127	76	$attributes = &$this->attributes;
128		-
129		- // Sanitize the layout attribute to prevent path traversal (LFI).
130		- $attributes['faqLayout'] = sanitize_file_name( $attributes['faqLayout'] );
131	77	$exclude = $this->get_groups_ids( $attributes['excludeFaqGroup'] );
132	78	$include = $this->get_groups_ids( $attributes['includeFaqGroup'] );
133		- $taxonomy = sanitize_key( $attributes['faqTaxonomy'] ?? 'betterdocs_faq_category' );
134	79
135		- $terms_query = betterdocs()->query->faq_terms_query_args( $include, $exclude, [], $taxonomy );
	80	+ $terms_query = betterdocs()->query->faq_terms_query_args( $include, $exclude );
136	81
137	82	return wp_parse_args(
138	83	[
139	84	'enable' => true,
		@@ -146,10 +91,8 @@
146	91	'class' => 'betterdocs-faq-' . $attributes['faqLayout'] . ' ' . $attributes['blockId'],
147	92	'groups' => $include,
148	93	'is_gutenberg' => true,
149	94	'faq_heading' => $attributes['faqSectionText'],
150		- 'faq_section_title_tag' => $attributes['faqSectionTitleTag'],
151		- 'faq_group_title_tag' => $attributes['faqGroupTitleTag'],
152	95	'faq_section_title_color' => $attributes['faqSectionTitleColor'],
153	96	'include_faq_group' => $this->string_to_array( $attributes['includeFaqGroup'] ),
154	97	'exclude_faq_group' => $this->string_to_array( $attributes['excludeFaqGroup'] ),
155	98	'faq_group_title_color' => $attributes['faqGroupTitleColor'],
		@@ -160,12 +103,9 @@
160	103	'faq_group_title_typography' => $attributes['faqGroupTitleTypography'],
161	104	'faq_per_page' => $attributes['faqPerPage'],
162	105	'show_button_icon' => $attributes['showButtonIcon'],
163	106	'button_icon_position' => $attributes['faqLayout'] == 'layout-1' || $attributes['faqLayout'] == 'layout-3' || $attributes['faqLayout'] == 'layout-4' ? 'after' : 'before',
164		- 'button_color' => $attributes['buttonColor'],
165		- 'faq_taxonomy' => $taxonomy,
166		- // Per-block order; empty falls back to the global FAQ order.
167		- 'order' => isset( $attributes['faqOrder'] ) ? $attributes['faqOrder'] : ''
	107	+ 'button_color' => $attributes['buttonColor']
168	108	]
169	109
170	110	]
171	111	);