← All changes | include/widget-languages.php +21 -21 2.8 → 2.5.2 View file →

		@@ -1,8 +1,5 @@
1	1	<?php
2		-/**
3		- * @package Polylang
4		- */
5	2
6	3	/**
7	4	* The language switcher widget
8	5	*
		@@ -17,9 +14,9 @@
17	14	*/
18	15	public function __construct() {
19	16	parent::__construct(
20	17	'polylang',
21		- __( 'Language switcher', 'polylang' ),
	18	+ __( 'Language Switcher', 'polylang' ),
22	19	array(
23	20	'description' => __( 'Displays a language switcher', 'polylang' ),
24	21	'customize_selective_refresh' => true,
25	22	)
		@@ -42,19 +39,19 @@
42	39	$title = empty( $instance['title'] ) ? '' : $instance['title'];
43	40	/** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */
44	41	$title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
45	42
46		- echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	43	+ echo $args['before_widget'];
47	44	if ( $title ) {
48		- echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput
	45	+ echo $args['before_title'] . $title . $args['after_title'];
49	46	}
50	47	if ( $instance['dropdown'] ) {
51	48	echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>';
52		- echo $list; // phpcs:ignore WordPress.Security.EscapeOutput
	49	+ echo $list;
53	50	} else {
54		- echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
	51	+ echo "<ul>\n" . $list . "</ul>\n";
55	52	}
56		- echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	53	+ echo $args['after_widget'];
57	54	}
58	55	}
59	56
60	57	/**
		@@ -66,9 +63,9 @@
66	63	* @param array $old_instance Old settings for this instance
67	64	* @return array Settings to save or bool false to cancel saving
68	65	*/
69	66	public function update( $new_instance, $old_instance ) {
70		- $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
	67	+ $instance['title'] = strip_tags( $new_instance['title'] );
71	68	foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
72	69	$instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0;
73	70	}
74	71
		@@ -88,27 +85,30 @@
88	85
89	86	// Title
90	87	printf(
91	88	'<p><label for="%1$s">%2$s</label><input class="widefat" id="%1$s" name="%3$s" type="text" value="%4$s" /></p>',
92		- esc_attr( $this->get_field_id( 'title' ) ),
	89	+ $this->get_field_id( 'title' ),
93	90	esc_html__( 'Title:', 'polylang' ),
94		- esc_attr( $this->get_field_name( 'title' ) ),
	91	+ $this->get_field_name( 'title' ),
95	92	esc_attr( $instance['title'] )
96	93	);
97	94
	95	+ $fields = '';
98	96	foreach ( PLL_Switcher::get_switcher_options( 'widget' ) as $key => $str ) {
99		- printf(
	97	+ $fields .= sprintf(
100	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>',
101		- esc_attr( $this->get_field_id( $key ) ),
102		- esc_attr( $this->get_field_name( $key ) ),
103		- checked( $instance[ $key ], true, false ),
	99	+ $this->get_field_id( $key ),
	100	+ $this->get_field_name( $key ),
	101	+ $instance[ $key ] ? ' checked="checked"' : '',
104	102	esc_html( $str ),
105		- in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? sprintf( ' class="no-dropdown-%s"', esc_attr( $this->id ) ) : '',
106		- ( ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '' ),
107		- 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
108	106	);
109	107	}
110	108
	109	+ echo $fields;
	110	+
111	111	// FIXME echoing script in form is not very clean
112	112	// but it does not work if enqueued properly :
113	113	// clicking save on a widget makes this code unreachable for the just saved widget ( ?! )
114	114	$this->admin_print_script();
		@@ -137,9 +137,9 @@
137	137
138	138	// Remove all options if dropdown is checked
139	139	$( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() {
140	140	var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
141		- pll_toggle( $( '.no-dropdown-' + this_id ), true != $( this ).prop( 'checked' ) );
	141	+ pll_toggle( $( '.no-dropdown-' + this_id ), 'checked' != $( this ).attr( 'checked' ) );
142	142	} );
143	143
144	144	// Disallow unchecking both show names and show flags
145	145	var options = ['-show_flags', '-show_names'];
		@@ -145,9 +145,9 @@
145	145	var options = ['-show_flags', '-show_names'];
146	146	$.each( options, function( i, v ) {
147	147	$( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() {
148	148	var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
149		- if ( true != $( this ).prop( 'checked' ) ) {
	149	+ if ( 'checked' != $( this ).attr( 'checked' ) ) {
150	150	$( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true );
151	151	}
152	152	} );
153	153	} );