← All changes | front-end/logout.php +15 -8 3.9.8 → 4.0.3 View file →

		@@ -21,26 +21,33 @@
21	21	else {
22	22	$display_username_email = $current_user->user_login;
23	23	}
24	24
25		- extract(shortcode_atts(array('text' => sprintf(__('You are currently logged in as %s. ', 'profile-builder'), $display_username_email), 'redirect' => '', 'redirect_url' => wppb_curpageurl(), 'redirect_priority' => 'normal', 'link_text' => __('Log out »', 'profile-builder'), 'url_only' => ''), $atts));
	25	+ $atts = shortcode_atts( array(
	26	+ 'text' => sprintf(__('You are currently logged in as %s. ', 'profile-builder'), $display_username_email),
	27	+ 'redirect' => '',
	28	+ 'redirect_url' => wppb_curpageurl(),
	29	+ 'redirect_priority' => 'normal',
	30	+ 'link_text' => __('Log out »', 'profile-builder'),
	31	+ 'url_only' => '',
	32	+ ), $atts, 'wppb-logout' );
26	33
27		- if( ! empty( $redirect ) ) {
28		- $redirect_url = $redirect;
	34	+ if( ! empty( $atts['redirect'] ) ) {
	35	+ $atts['redirect_url'] = $atts['redirect'];
29	36	}
30	37
31	38	// CHECK FOR REDIRECT
32		- $redirect_url = wppb_get_redirect_url( $redirect_priority, 'after_logout', $redirect_url, $current_user );
	39	+ $redirect_url = wppb_get_redirect_url( $atts['redirect_priority'], 'after_logout', esc_url_raw( $atts['redirect_url'] ), $current_user );
33	40	$redirect_url = apply_filters( 'wppb_after_logout_redirect_url', $redirect_url );
34	41
35		- if( isset( $url_only ) && $url_only == 'yes' )
	42	+ if( isset( $atts['url_only'] ) && $atts['url_only'] == 'yes' )
36	43	return wp_logout_url( $redirect_url );
37	44
38		- $logout_link = '<a href="' . wp_logout_url( $redirect_url ) . '" class="wppb-logout-url" title="' . __( 'Log out of this account', 'profile-builder' ) . '">' . $link_text . '</a>';
	45	+ $logout_link = '<a href="' . esc_url( wp_logout_url( $redirect_url ) ) . '" class="wppb-logout-url" title="' . esc_attr__( 'Log out of this account', 'profile-builder' ) . '">' . esc_html( $atts['link_text'] ) . '</a>';
39	46
40	47	$meta_tags = apply_filters( 'wppb_front_end_logout_meta_tags', array( '{{meta_user_name}}', '{{meta_first_name}}', '{{meta_last_name}}', '{{meta_display_name}}' ) );
41	48	$meta_tags_values = apply_filters( 'wppb_front_end_logout_meta_tags_values', array( $current_user->user_login, $current_user->first_name, $current_user->last_name, $current_user->display_name ) );
42	49
43		- $text = apply_filters( 'wppb_front_end_logout_text', str_replace( $meta_tags, $meta_tags_values, $text ), $current_user );
	50	+ $text = apply_filters( 'wppb_front_end_logout_text', str_replace( $meta_tags, $meta_tags_values, $atts['text'] ), $current_user );
44	51
45		- return apply_filters( 'wppb_logout_message', '<p class="wppb-front-end-logout"><span>' . $text . '</span>' . $logout_link . '</p>');
	52	+ return apply_filters( 'wppb_logout_message', '<p class="wppb-front-end-logout"><span>' . esc_html( $text ) . '</span>' . $logout_link . '</p>' );
46	53	}