| @@ -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 | ) |
| @@ -34,50 +31,27 @@ | ||
| 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 | 34 | public function widget( $args, $instance ) { |
| 38 | - // Sets a unique id for dropdown. | |
| 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 | 39 | $title = empty( $instance['title'] ) ? '' : $instance['title']; |
| 43 | - | |
| 44 | 40 | /** This filter is documented in wp-includes/widgets/class-wp-widget-pages.php */ |
| 45 | 41 | $title = apply_filters( 'widget_title', $title, $instance, $this->id_base ); |
| 46 | 42 | |
| 47 | - echo $args['before_widget']; // phpcs:ignore WordPress.Security.EscapeOutput | |
| 48 | - | |
| 43 | + echo $args['before_widget']; | |
| 49 | 44 | if ( $title ) { |
| 50 | - echo $args['before_title'] . $title . $args['after_title']; // phpcs:ignore WordPress.Security.EscapeOutput | |
| 45 | + echo $args['before_title'] . $title . $args['after_title']; | |
| 51 | 46 | } |
| 52 | - | |
| 53 | - // The title may be filtered: Strip out HTML and make sure the aria-label is never empty. | |
| 54 | - $aria_label = trim( wp_strip_all_tags( $title ) ); | |
| 55 | - if ( ! $aria_label ) { | |
| 56 | - $aria_label = __( 'Choose a language', 'polylang' ); | |
| 57 | - } | |
| 58 | - | |
| 59 | 47 | if ( $instance['dropdown'] ) { |
| 60 | - echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html( $aria_label ) . '</label>'; | |
| 61 | - echo $list; // phpcs:ignore WordPress.Security.EscapeOutput | |
| 48 | + echo '<label class="screen-reader-text" for="' . esc_attr( 'lang_choice_' . $instance['dropdown'] ) . '">' . esc_html__( 'Choose a language', 'polylang' ) . '</label>'; | |
| 49 | + echo $list; | |
| 62 | 50 | } else { |
| 63 | - $format = current_theme_supports( 'html5', 'navigation-widgets' ) ? 'html5' : 'xhtml'; | |
| 64 | - | |
| 65 | - /** This filter is documented in wp-includes/widgets/class-wp-nav-menu-widget.php */ | |
| 66 | - $format = apply_filters( 'navigation_widgets_format', $format ); | |
| 67 | - | |
| 68 | - if ( 'html5' === $format ) { | |
| 69 | - echo '<nav role="navigation" aria-label="' . esc_attr( $aria_label ) . '">'; | |
| 70 | - } | |
| 71 | - | |
| 72 | - echo "<ul>\n" . $list . "</ul>\n"; // phpcs:ignore WordPress.Security.EscapeOutput | |
| 73 | - | |
| 74 | - if ( 'html5' === $format ) { | |
| 75 | - echo '</nav>'; | |
| 76 | - } | |
| 51 | + echo "<ul>\n" . $list . "</ul>\n"; | |
| 77 | 52 | } |
| 78 | - | |
| 79 | - echo $args['after_widget']; // phpcs:ignore WordPress.Security.EscapeOutput | |
| 53 | + echo $args['after_widget']; | |
| 80 | 54 | } |
| 81 | 55 | } |
| 82 | 56 | |
| 83 | 57 | /** |
| @@ -88,10 +62,10 @@ | ||
| 88 | 62 | * @param array $new_instance New settings for this instance as input by the user via form() |
| 89 | 63 | * @param array $old_instance Old settings for this instance |
| 90 | 64 | * @return array Settings to save or bool false to cancel saving |
| 91 | 65 | */ |
| 92 | - public function update( $new_instance, $old_instance ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable | |
| 93 | - $instance = array( 'title' => sanitize_text_field( $new_instance['title'] ) ); | |
| 66 | + public function update( $new_instance, $old_instance ) { | |
| 67 | + $instance['title'] = strip_tags( $new_instance['title'] ); | |
| 94 | 68 | foreach ( array_keys( PLL_Switcher::get_switcher_options( 'widget' ) ) as $key ) { |
| 95 | 69 | $instance[ $key ] = ! empty( $new_instance[ $key ] ) ? 1 : 0; |
| 96 | 70 | } |
| 97 | 71 | |
| @@ -111,24 +85,75 @@ | ||
| 111 | 85 | |
| 112 | 86 | // Title |
| 113 | 87 | printf( |
| 114 | 88 | '<p><label for="%1$s">%2$s</label><input class="widefat" id="%1$s" name="%3$s" type="text" value="%4$s" /></p>', |
| 115 | - esc_attr( $this->get_field_id( 'title' ) ), | |
| 89 | + $this->get_field_id( 'title' ), | |
| 116 | 90 | esc_html__( 'Title:', 'polylang' ), |
| 117 | - esc_attr( $this->get_field_name( 'title' ) ), | |
| 91 | + $this->get_field_name( 'title' ), | |
| 118 | 92 | esc_attr( $instance['title'] ) |
| 119 | 93 | ); |
| 120 | 94 | |
| 95 | + $fields = ''; | |
| 121 | 96 | foreach ( PLL_Switcher::get_switcher_options( 'widget' ) as $key => $str ) { |
| 122 | - printf( | |
| 97 | + $fields .= sprintf( | |
| 123 | 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>', |
| 124 | - esc_attr( $this->get_field_id( $key ) ), | |
| 125 | - esc_attr( $this->get_field_name( $key ) ), | |
| 126 | - checked( $instance[ $key ], true, false ), | |
| 99 | + $this->get_field_id( $key ), | |
| 100 | + $this->get_field_name( $key ), | |
| 101 | + $instance[ $key ] ? ' checked="checked"' : '', | |
| 127 | 102 | esc_html( $str ), |
| 128 | - in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? sprintf( ' class="no-dropdown-%s"', esc_attr( $this->id ) ) : '', | |
| 129 | - ( ! empty( $instance['dropdown'] ) && in_array( $key, array( 'show_names', 'show_flags', 'hide_current' ) ) ? ' style="display:none;"' : '' ), | |
| 130 | - 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 | |
| 131 | 106 | ); |
| 132 | 107 | } |
| 108 | + | |
| 109 | + echo $fields; | |
| 110 | + | |
| 111 | + // FIXME echoing script in form is not very clean | |
| 112 | + // but it does not work if enqueued properly : | |
| 113 | + // clicking save on a widget makes this code unreachable for the just saved widget ( ?! ) | |
| 114 | + $this->admin_print_script(); | |
| 115 | + } | |
| 116 | + | |
| 117 | + /** | |
| 118 | + * Add javascript to control the language switcher options | |
| 119 | + * | |
| 120 | + * @since 1.3 | |
| 121 | + */ | |
| 122 | + public function admin_print_script() { | |
| 123 | + static $done = false; | |
| 124 | + | |
| 125 | + if ( $done ) { | |
| 126 | + return; | |
| 127 | + } | |
| 128 | + | |
| 129 | + $done = true; | |
| 130 | + ?> | |
| 131 | + <script type='text/javascript'> | |
| 132 | + //<![CDATA[ | |
| 133 | + jQuery( document ).ready( function( $ ) { | |
| 134 | + function pll_toggle( a, test ) { | |
| 135 | + test ? a.show() : a.hide(); | |
| 136 | + } | |
| 137 | + | |
| 138 | + // Remove all options if dropdown is checked | |
| 139 | + $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll-dropdown', function() { | |
| 140 | + var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' ); | |
| 141 | + pll_toggle( $( '.no-dropdown-' + this_id ), 'checked' != $( this ).attr( 'checked' ) ); | |
| 142 | + } ); | |
| 143 | + | |
| 144 | + // Disallow unchecking both show names and show flags | |
| 145 | + var options = ['-show_flags', '-show_names']; | |
| 146 | + $.each( options, function( i, v ) { | |
| 147 | + $( '.widgets-sortables,.control-section-sidebar' ).on( 'change', '.pll' + v, function() { | |
| 148 | + var this_id = $( this ).parent().parent().parent().children( '.widget-id' ).attr( 'value' ); | |
| 149 | + if ( 'checked' != $( this ).attr( 'checked' ) ) { | |
| 150 | + $( '#widget-' + this_id + options[ 1-i ] ).prop( 'checked', true ); | |
| 151 | + } | |
| 152 | + } ); | |
| 153 | + } ); | |
| 154 | + } ); | |
| 155 | + //]]> | |
| 156 | + </script> | |
| 157 | + <?php | |
| 133 | 158 | } |
| 134 | 159 | } |
