← All changes | include/widget-languages.php +27 -34 2.8 → 2.0.3 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	*
		@@ -14,14 +11,14 @@
14	11	* Constructor
15	12	*
16	13	* @since 0.1
17	14	*/
18		- public function __construct() {
	15	+ function __construct() {
19	16	parent::__construct(
20	17	'polylang',
21		- __( 'Language switcher', 'polylang' ),
	18	+ __( 'Language Switcher', 'polylang' ),
22	19	array(
23		- 'description' => __( 'Displays a language switcher', 'polylang' ),
	20	+ 'description' => __( 'Displays a language switcher', 'polylang' ),
24	21	'customize_selective_refresh' => true,
25	22	)
26	23	);
27	24	}
		@@ -33,9 +30,9 @@
33	30	*
34	31	* @param array $args Display arguments including before_title, after_title, before_widget, and after_widget.
35	32	* @param array $instance The settings for the particular instance of the widget
36	33	*/
37		- public function widget( $args, $instance ) {
	34	+ function widget( $args, $instance ) {
38	35	// Sets a unique id for dropdown
39	36	$instance['dropdown'] = empty( $instance['dropdown'] ) ? 0 : $args['widget_id'];
40	37
41	38	if ( $list = pll_the_languages( array_merge( $instance, array( 'echo' => 0 ) ) ) ) {
		@@ -42,19 +39,14 @@
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		- if ( $instance['dropdown'] ) {
51		- 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
53		- } else {
54		- echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput
55		- }
56		- echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput
	47	+ echo $instance['dropdown'] ? $list : "<ul>\n" . $list . "</ul>\n";
	48	+ echo $args['after_widget'];
57	49	}
58	50	}
59	51
60	52	/**
		@@ -65,10 +57,10 @@
65	57	* @param array $new_instance New settings for this instance as input by the user via form()
66	58	* @param array $old_instance Old settings for this instance
67	59	* @return array Settings to save or bool false to cancel saving
68	60	*/
69		- public function update( $new_instance, $old_instance ) {
70		- $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) );
	61	+ function update( $new_instance, $old_instance ) {
	62	+ $instance['title'] = strip_tags( $new_instance['title'] );
71	63	foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) {
72	64	$instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0;
73	65	}
74	66
		@@ -81,9 +73,9 @@
81	73	* @since 0.4
82	74	*
83	75	* @param array $instance Current settings
84	76	*/
85		- public function form( $instance ) {
	77	+ function form( $instance ) {
86	78	// Default values
87	79	$instance = wp_parse_args( (array) $instance, array_merge( array( 'title' => '' ), PLL_Switcher::get_switcher_options( 'widget', 'default' ) ) );
88	80
89	81	// Title
		@@ -88,27 +80,30 @@
88	80
89	81	// Title
90	82	printf(
91	83	'<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' ) ),
	84	+ $this->get_field_id( 'title' ),
93	85	esc_html__( 'Title:', 'polylang' ),
94		- esc_attr( $this->get_field_name( 'title' ) ),
	86	+ $this->get_field_name( 'title' ),
95	87	esc_attr( $instance['title'] )
96	88	);
97	89
	90	+ $fields = '';
98	91	foreach ( PLL_Switcher::get_switcher_options( 'widget' ) as $key => $str ) {
99		- printf(
	92	+ $fields .= sprintf(
100	93	'<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 ),
	94	+ $this->get_field_id( $key ),
	95	+ $this->get_field_name( $key ),
	96	+ $instance[ $key ] ? ' checked="checked"' : '',
104	97	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 )
	98	+ in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' class="no-dropdown-' . $this->id . '"' : '',
	99	+ ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '',
	100	+ 'pll-' . $key
108	101	);
109	102	}
110	103
	104	+ echo $fields;
	105	+
111	106	// FIXME echoing script in form is not very clean
112	107	// but it does not work if enqueued properly :
113	108	// clicking save on a widget makes this code unreachable for the just saved widget ( ?! )
114	109	$this->admin_print_script();
		@@ -125,10 +120,9 @@
125	120	if ( $done ) {
126	121	return;
127	122	}
128	123
129		- $done = true;
130		- ?>
	124	+ $done = true; ?>
131	125	<script type='text/javascript'>
132	126	//<![CDATA[
133	127	jQuery( document ).ready( function( $ ) {
134	128	function pll_toggle( a, test ) {
		@@ -137,9 +131,9 @@
137	131
138	132	// Remove all options if dropdown is checked
139	133	$( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() {
140	134	var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
141		- pll_toggle( $( '.no-dropdown-' + this_id ), true != $( this ).prop( 'checked' ) );
	135	+ pll_toggle( $( '.no-dropdown-' + this_id ), 'checked' != $( this ).attr( 'checked' ) );
142	136	} );
143	137
144	138	// Disallow unchecking both show names and show flags
145	139	var options = ['-show_flags', '-show_names'];
		@@ -145,9 +139,9 @@
145	139	var options = ['-show_flags', '-show_names'];
146	140	$.each( options, function( i, v ) {
147	141	$( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() {
148	142	var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' );
149		- if ( true != $( this ).prop( 'checked' ) ) {
	143	+ if ( 'checked' != $( this ).attr( 'checked' ) ) {
150	144	$( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true );
151	145	}
152	146	} );
153	147	} );
		@@ -152,8 +146,7 @@
152	146	} );
153	147	} );
154	148	} );
155	149	//]]>
156		- </script>
157		- <?php
	150	+ </script><?php
158	151	}
159	152	}