← All changes | inc/class-ps-public.php +37 -11 4.3.5 → 4.3.17 View file →

		@@ -28,9 +28,9 @@
28	28	add_filter( 'the_content', array($this, 'filter_the_content') );
29	29	add_filter( 'acf_the_content', array($this, 'filter_the_content') );
30	30	add_filter( 'get_the_excerpt', array($this, 'filter_the_content') );
31	31	add_action( 'template_redirect', array($this, 'check_global_proctection') );
32		- add_action( 'wp_enqueue_scripts', array($this, 'add_public_scripts') );
	32	+ add_action( 'wp_enqueue_scripts', array($this, 'add_public_scripts'), 9999 );
33	33	}
34	34
35	35	/**
36	36	* Returns instance of PS_Public.
		@@ -44,8 +44,26 @@
44	44	return self::$instance;
45	45	}
46	46
47	47	/**
	48	+ * Avoids re-entering the_content recursively.
	49	+ *
	50	+ * @param string $content the unlocked content.
	51	+ *
	52	+ * @return string
	53	+ */
	54	+ private function render_unlocked_content( string $content ) : string {
	55	+ if ( doing_filter( 'the_content' ) ) {
	56	+ // Mirror the_content order: blocks first, wpautop only for classic content.
	57	+ if ( has_blocks( $content ) ) {
	58	+ return do_shortcode( do_blocks( $content ) );
	59	+ }
	60	+ return wpautop( do_shortcode( $content ) );
	61	+ }
	62	+ return apply_filters( 'the_content', $content );
	63	+ }
	64	+
	65	+ /**
48	66	* Render the Passster shortcode.
49	67	*
50	68	* @param array $atts array of attributes.
51	69	* @param string|null $content the current content.
		@@ -70,9 +88,9 @@
70	88	}
71	89	if ( !$in_schedule ) {
72	90	$area = get_post( $area_id );
73	91	if ( $area && ('publish' === $area->post_status || current_user_can( 'edit_post', $area_id )) ) {
74		- return apply_filters( 'the_content', str_replace( '{post-id}', get_the_id(), $area->post_content ) );
	92	+ return $this->render_unlocked_content( str_replace( '{post-id}', get_the_id(), $area->post_content ) );
75	93	}
76	94	return $content ?? '';
77	95	}
78	96	}
		@@ -86,12 +104,12 @@
86	104	$area = get_post( $area_id );
87	105	if ( 'publish' === $area->post_status || current_user_can( 'edit_post', $area_id ) ) {
88	106	$content = $area->post_content;
89	107	do_action( 'passster_content_unlocked' );
90		- return apply_filters( 'the_content', str_replace( '{post-id}', get_the_id(), $content ) );
	108	+ return $this->render_unlocked_content( str_replace( '{post-id}', get_the_id(), $content ) );
91	109	}
92	110	} else {
93		- $content = apply_filters( 'the_content', $content );
	111	+ $content = $this->render_unlocked_content( $content );
94	112	do_action( 'passster_content_unlocked' );
95	113	return apply_filters( 'passster_content', $content );
96	114	}
97	115	}
		@@ -178,8 +196,11 @@
178	196	$form = str_replace( '[PASSSTER_POST_ID]', absint( get_the_ID() ), $form );
179	197	// term id (for category archive protection — passed to REST API so it can validate against term meta).
180	198	$term_id_val = ( !empty( $atts['term_id'] ) ? absint( $atts['term_id'] ) : 0 );
181	199	$form = str_replace( '[PASSSTER_TERM_ID]', $term_id_val, $form );
	200	+ // post type (for post type archive protection — passed to REST API so it can validate against post type config).
	201	+ $post_type_val = ( !empty( $atts['post_type'] ) ? sanitize_key( $atts['post_type'] ) : '' );
	202	+ $form = str_replace( '[PASSSTER_POST_TYPE]', esc_attr( $post_type_val ), $form );
182	203	// hide or not.
183	204	if ( !empty( $atts['hide'] ) ) {
184	205	$form = str_replace( '[PASSSTER_HIDE]', ' passster-hide', $form );
185	206	} else {
		@@ -228,12 +249,13 @@
228	249	$user_restriction = get_post_meta( $post_id, 'passster_user_restriction', true );
229	250	// Redirection.
230	251	$redirection = get_post_meta( $post_id, 'passster_redirect_url', true );
231	252	// texts.
232		- $headline = get_post_meta( $post_id, 'passster_headline', true );
233		- $instruction = get_post_meta( $post_id, 'passster_instruction', true );
234		- $placeholder = get_post_meta( $post_id, 'passster_placeholder', true );
235		- $button = get_post_meta( $post_id, 'passster_button', true );
	253	+ $overwrite_defaults = get_post_meta( $post_id, 'passster_activate_overwrite_defaults', true );
	254	+ $headline = ( $overwrite_defaults ? get_post_meta( $post_id, 'passster_headline', true ) : '' );
	255	+ $instruction = ( $overwrite_defaults ? get_post_meta( $post_id, 'passster_instruction', true ) : '' );
	256	+ $placeholder = ( $overwrite_defaults ? get_post_meta( $post_id, 'passster_placeholder', true ) : '' );
	257	+ $button = ( $overwrite_defaults ? get_post_meta( $post_id, 'passster_button', true ) : '' );
236	258	$id = get_post_meta( $post_id, 'passster_id', true );
237	259	if ( !$activate_protection ) {
238	260	return $content;
239	261	}
		@@ -309,9 +331,9 @@
309	331	$post_id = esc_html( $options['global_protection_id'] );
310	332	$is_active = esc_html( $options['activate_global_protection'] );
311	333	$atts = array();
312	334	$password = get_post_meta( $post_id, 'passster_password', true );
313		- $atts['password'] = esc_html( $password );
	335	+ $atts['password'] = $password;
314	336	if ( !empty( $post_id ) ) {
315	337	if ( $is_active ) {
316	338	if ( is_page( $post_id ) || is_single( $post_id ) ) {
317	339	return;
		@@ -379,8 +401,12 @@
379	401	$shortcodes[$shortcode] = do_shortcode( str_replace( '{post-id}', get_the_id(), $shortcode ) );
380	402	}
381	403	}
382	404	}
	405	+ // Archive/taxonomy pages have no singular post, so get_permalink() can't be used
	406	+ // to build the "reload after unlock" URL for links generated by area/CPT-level protection.
	407	+ $current_post_id = get_the_id();
	408	+ $reload_url = ( $current_post_id ? get_permalink( $current_post_id ) : esc_url_raw( remove_query_arg( 'pass' ) ) );
383	409	$args = array(
384	410	'ajax_url' => admin_url() . 'admin-ajax.php',
385	411	'rest_url' => get_rest_url(),
386	412	'nonce' => wp_create_nonce( 'ps-password-nonce' ),
		@@ -385,11 +411,11 @@
385	411	'rest_url' => get_rest_url(),
386	412	'nonce' => wp_create_nonce( 'ps-password-nonce' ),
387	413	'hash_nonce' => wp_create_nonce( 'ps-hash-nonce' ),
388	414	'logout_nonce' => wp_create_nonce( 'ps-logout-nonce' ),
389		- 'post_id' => get_the_id(),
	415	+ 'post_id' => $current_post_id,
390	416	'shortcodes' => $shortcodes,
391		- 'permalink' => get_permalink( get_the_id() ),
	417	+ 'permalink' => $reload_url,
392	418	);
393	419	if ( isset( $options['cookie_duration_unit'] ) ) {
394	420	$args['cookie_duration_unit'] = esc_html( $options['cookie_duration_unit'] );
395	421	} else {