← All changes | include/widget-languages.php +24 -21 2.7.2 → 2.3.6 View file →

		@@ -11,14 +11,14 @@
11	11	* Constructor
12	12	*
13	13	* @since 0.1
14	14	*/
15		- public function __construct() {
	15	+ function __construct() {
16	16	parent::__construct(
17	17	'polylang',
18		- __( 'Language switcher', 'polylang' ),
	18	+ __( 'Language Switcher', 'polylang' ),
19	19	array(
20		- 'description' => __( 'Displays a language switcher', 'polylang' ),
	20	+ 'description' => __( 'Displays a language switcher', 'polylang' ),
21	21	'customize_selective_refresh' => true,
22	22	)
23	23	);
24	24	}
		@@ -30,9 +30,9 @@
30	30	*
31	31	* @param array $args Display arguments including before_title, after_title, before_widget, and after_widget.
32	32	* @param array $instance The settings for the particular instance of the widget
33	33	*/
34		- public function widget( $args, $instance ) {
	34	+ function widget( $args, $instance ) {
35	35	// Sets a unique id for dropdown
36	36	$instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $args['widget_id'];
37	37
38	38	if ( $list = pll_the_languages( array_merge( $instance, array( 'echo' => 0 ) ) ) ) {
		@@ -39,19 +39,19 @@
39	39	$title = empty( $instance['title'] ) ? '' : $instance['title'];
40	40	/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
41	41	$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
42	42
43		- echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	43	+ echo $args['before_widget'];
44	44	if ( $title ) {
45		- echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput
	45	+ echo $args['before_title'] . $title . $args['after_title'];
46	46	}
47	47	if ( $instance['dropdown'] ) {
48	48	echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>';
49		- echo $list; // phpcs:ignore WordPress.Security.EscapeOutput
	49	+ echo $list;
50	50	} else {
51		- echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
	51	+ echo "<ul>\n" . $list . "</ul>\n";
52	52	}
53		- echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	53	+ echo $args['after_widget'];
54	54	}
55	55	}
56	56
57	57	/**
		@@ -62,10 +62,10 @@
62	62	* @param array $new_instance New settings for this instance as input by the user via form()
63	63	* @param array $old_instance Old settings for this instance
64	64	* @return array Settings to save or bool false to cancel saving
65	65	*/
66		- public function update( $new_instance, $old_instance ) {
67		- $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
	66	+ function update( $new_instance, $old_instance ) {
	67	+ $instance['title'] = strip_tags( $new_instance['title'] );
68	68	foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
69	69	$instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0;
70	70	}
71	71
		@@ -78,9 +78,9 @@
78	78	* @since 0.4
79	79	*
80	80	* @param array $instance Current settings
81	81	*/
82		- public function form( $instance ) {
	82	+ function form( $instance ) {
83	83	// Default values
84	84	$instance = wp_parse_args( (array) $instance, array_merge( array( 'title' => '' ), PLL_Switcher::get_switcher_options( 'widget', 'default' ) ) );
85	85
86	86	// Title
		@@ -85,26 +85,29 @@
85	85
86	86	// Title
87	87	printf(
88	88	'<p><label for="%1$s">%2$s</label><input class="widefat" id="%1$s" name="%3$s" type="text" value="%4$s" /></p>',
89		- esc_attr( $this->get_field_id( 'title' ) ),
	89	+ $this->get_field_id( 'title' ),
90	90	esc_html__( 'Title:', 'polylang' ),
91		- esc_attr( $this->get_field_name( 'title' ) ),
	91	+ $this->get_field_name( 'title' ),
92	92	esc_attr( $instance['title'] )
93	93	);
94	94
	95	+ $fields = '';
95	96	foreach ( PLL_Switcher::get_switcher_options( 'widget' ) as $key => $str ) {
96		- printf(
	97	+ $fields .= sprintf(
97	98	'<div%5$s%6$s><input type="checkbox" class="checkbox %7$s" id="%1$s" name="%2$s"%3$s /><label for="%1$s">%4$s</label></div>',
98		- esc_attr( $this->get_field_id( $key ) ),
99		- esc_attr( $this->get_field_name( $key ) ),
100		- checked( $instance[ $key ], true, false ),
	99	+ $this->get_field_id( $key ),
	100	+ $this->get_field_name( $key ),
	101	+ $instance[ $key ] ? ' checked="checked"' : '',
101	102	esc_html( $str ),
102		- in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? sprintf( ' class="no-dropdown-%s"', esc_attr( $this->id ) ) : '',
103		- ( ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '' ),
104		- esc_attr( 'pll-' . $key )
	103	+ in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' class="no-dropdown-' . $this->id . '"' : '',
	104	+ ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '',
	105	+ 'pll-' . $key
105	106	);
106	107	}
	108	+
	109	+ echo $fields;
107	110
108	111	// FIXME echoing script in form is not very clean
109	112	// but it does not work if enqueued properly :
110	113	// clicking save on a widget makes this code unreachable for the just saved widget ( ?! )