| @@ -1,8 +1,5 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | if ( ! class_exists( 'WP_List_Table' ) ) { |
| 7 | 4 | require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php'; // since WP 3.1 |
| 8 | 5 | } |
| @@ -13,42 +10,16 @@ | ||
| 13 | 10 | * |
| 14 | 11 | * @since 0.6 |
| 15 | 12 | */ |
| 16 | 13 | class PLL_Table_String extends WP_List_Table { |
| 17 | - /** | |
| 18 | - * The list of languages. | |
| 19 | - * | |
| 20 | - * @var PLL_Language[] | |
| 21 | - */ | |
| 22 | - protected $languages; | |
| 14 | + protected $languages, $strings, $groups, $selected_group; | |
| 23 | 15 | |
| 24 | 16 | /** |
| 25 | - * Registered strings. | |
| 17 | + * Constructor | |
| 26 | 18 | * |
| 27 | - * @var array | |
| 28 | - */ | |
| 29 | - protected $strings; | |
| 30 | - | |
| 31 | - /** | |
| 32 | - * The string groups. | |
| 33 | - * | |
| 34 | - * @var string[] | |
| 35 | - */ | |
| 36 | - protected $groups; | |
| 37 | - | |
| 38 | - /** | |
| 39 | - * The selected string group or -1 if none is selected. | |
| 40 | - * | |
| 41 | - * @var string|int | |
| 42 | - */ | |
| 43 | - protected $selected_group; | |
| 44 | - | |
| 45 | - /** | |
| 46 | - * Constructor. | |
| 47 | - * | |
| 48 | 19 | * @since 0.6 |
| 49 | 20 | * |
| 50 | - * @param PLL_Language[] $languages List of languages. | |
| 21 | + * @param array $languages list of languages | |
| 51 | 22 | */ |
| 52 | 23 | public function __construct( $languages ) { |
| 53 | 24 | parent::__construct( |
| 54 | 25 | array( |
| @@ -59,18 +30,10 @@ | ||
| 59 | 30 | |
| 60 | 31 | $this->languages = $languages; |
| 61 | 32 | $this->strings = PLL_Admin_Strings::get_strings(); |
| 62 | 33 | $this->groups = array_unique( wp_list_pluck( $this->strings, 'context' ) ); |
| 34 | + $this->selected_group = empty( $_GET['group'] ) || ! in_array( $_GET['group'], $this->groups ) ? -1 : $_GET['group']; | |
| 63 | 35 | |
| 64 | - $this->selected_group = -1; | |
| 65 | - | |
| 66 | - if ( ! empty( $_GET['group'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 67 | - $group = sanitize_text_field( wp_unslash( $_GET['group'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 68 | - if ( in_array( $group, $this->groups ) ) { | |
| 69 | - $this->selected_group = $group; | |
| 70 | - } | |
| 71 | - } | |
| 72 | - | |
| 73 | 36 | add_action( 'mlang_action_string-translation', array( $this, 'save_translations' ) ); |
| 74 | 37 | } |
| 75 | 38 | |
| 76 | 39 | /** |
| @@ -98,9 +61,9 @@ | ||
| 98 | 61 | return sprintf( |
| 99 | 62 | '<label class="screen-reader-text" for="cb-select-%1$s">%2$s</label><input id="cb-select-%1$s" type="checkbox" name="strings[]" value="%1$s" %3$s />', |
| 100 | 63 | esc_attr( $item['row'] ), |
| 101 | 64 | /* translators: accessibility text, %s is a string potentially in any language */ |
| 102 | - sprintf( __( 'Select %s', 'polylang' ), format_to_edit( $item['string'] ) ), | |
| 65 | + sprintf( __( 'Select %s' ), format_to_edit( $item['string'] ) ), | |
| 103 | 66 | empty( $item['icl'] ) ? 'disabled' : '' // Only strings registered with WPML API can be removed |
| 104 | 67 | ); |
| 105 | 68 | } |
| 106 | 69 | |
| @@ -144,17 +107,17 @@ | ||
| 144 | 107 | return $out; |
| 145 | 108 | } |
| 146 | 109 | |
| 147 | 110 | /** |
| 148 | - * Gets the list of columns. | |
| 111 | + * Gets the list of columns | |
| 149 | 112 | * |
| 150 | 113 | * @since 0.6 |
| 151 | 114 | * |
| 152 | - * @return string[] The list of column titles. | |
| 115 | + * @return array the list of column titles | |
| 153 | 116 | */ |
| 154 | 117 | public function get_columns() { |
| 155 | 118 | return array( |
| 156 | - 'cb' => '<input type="checkbox" />', // Checkbox. | |
| 119 | + 'cb' => '<input type="checkbox" />', // Checkbox | |
| 157 | 120 | 'string' => esc_html__( 'String', 'polylang' ), |
| 158 | 121 | 'name' => esc_html__( 'Name', 'polylang' ), |
| 159 | 122 | 'context' => esc_html__( 'Group', 'polylang' ), |
| 160 | 123 | 'translations' => esc_html__( 'Translations', 'polylang' ), |
| @@ -187,31 +150,8 @@ | ||
| 187 | 150 | return 'string'; |
| 188 | 151 | } |
| 189 | 152 | |
| 190 | 153 | /** |
| 191 | - * Search for a string in translations. Case insensitive. | |
| 192 | - * | |
| 193 | - * @since 2.6 | |
| 194 | - * | |
| 195 | - * @param PLL_MO[] $mos An array of PLL_MO objects. | |
| 196 | - * @param string $s Searched string. | |
| 197 | - * @return string[] Found strings. | |
| 198 | - */ | |
| 199 | - protected function search_in_translations( $mos, $s ) { | |
| 200 | - $founds = array(); | |
| 201 | - | |
| 202 | - foreach ( $mos as $mo ) { | |
| 203 | - foreach ( wp_list_pluck( $mo->entries, 'translations' ) as $string => $translation ) { | |
| 204 | - if ( false !== stripos( $translation[0], $s ) ) { | |
| 205 | - $founds[] = $string; | |
| 206 | - } | |
| 207 | - } | |
| 208 | - } | |
| 209 | - | |
| 210 | - return array_unique( $founds ); | |
| 211 | - } | |
| 212 | - | |
| 213 | - /** | |
| 214 | 154 | * Sort items |
| 215 | 155 | * |
| 216 | 156 | * @since 0.6 |
| 217 | 157 | * |
| @@ -219,17 +159,10 @@ | ||
| 219 | 159 | * @param object $b The second object to compare |
| 220 | 160 | * @return int -1 or 1 if $a is considered to be respectively less than or greater than $b. |
| 221 | 161 | */ |
| 222 | 162 | protected function usort_reorder( $a, $b ) { |
| 223 | - if ( ! empty( $_GET['orderby'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 224 | - $orderby = sanitize_key( $_GET['orderby'] ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 225 | - if ( isset( $a[ $orderby ], $b[ $orderby ] ) ) { | |
| 226 | - $result = strcmp( $a[ $orderby ], $b[ $orderby ] ); // Determine sort order | |
| 227 | - return ( empty( $_GET['order'] ) || 'asc' === $_GET['order'] ) ? $result : -$result; // phpcs:ignore WordPress.Security.NonceVerification | |
| 228 | - } | |
| 229 | - } | |
| 230 | - | |
| 231 | - return 0; | |
| 163 | + $result = strcmp( $a[ $_GET['orderby'] ], $b[ $_GET['orderby'] ] ); // determine sort order | |
| 164 | + return ( empty( $_GET['order'] ) || 'asc' === $_GET['order'] ) ? $result : -$result; // send final sort direction to usort | |
| 232 | 165 | } |
| 233 | 166 | |
| 234 | 167 | /** |
| 235 | 168 | * Prepares the list of items for displaying |
| @@ -234,56 +167,44 @@ | ||
| 234 | 167 | /** |
| 235 | 168 | * Prepares the list of items for displaying |
| 236 | 169 | * |
| 237 | 170 | * @since 0.6 |
| 238 | - * | |
| 239 | - * @return void | |
| 240 | 171 | */ |
| 241 | 172 | public function prepare_items() { |
| 242 | - // Is admin language filter active? | |
| 243 | - if ( $lg = get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ) { | |
| 244 | - $languages = wp_list_filter( $this->languages, array( 'slug' => $lg ) ); | |
| 245 | - } else { | |
| 246 | - $languages = $this->languages; | |
| 247 | - } | |
| 248 | - | |
| 249 | - // Load translations | |
| 250 | - $mo = array(); | |
| 251 | - foreach ( $languages as $language ) { | |
| 252 | - $mo[ $language->slug ] = new PLL_MO(); | |
| 253 | - $mo[ $language->slug ]->import_from_db( $language ); | |
| 254 | - } | |
| 255 | - | |
| 256 | 173 | $data = $this->strings; |
| 257 | 174 | |
| 258 | - // Filter by selected group | |
| 259 | - if ( -1 !== $this->selected_group ) { | |
| 260 | - $data = wp_list_filter( $data, array( 'context' => $this->selected_group ) ); | |
| 175 | + // Filter for search string | |
| 176 | + $s = empty( $_GET['s'] ) ? '' : wp_unslash( $_GET['s'] ); | |
| 177 | + foreach ( $data as $key => $row ) { | |
| 178 | + if ( ( -1 !== $this->selected_group && $row['context'] !== $this->selected_group ) || ( ! empty( $s ) && stripos( $row['name'], $s ) === false && stripos( $row['string'], $s ) === false ) ) { | |
| 179 | + unset( $data[ $key ] ); | |
| 180 | + } | |
| 261 | 181 | } |
| 262 | 182 | |
| 263 | - // Filter by searched string | |
| 264 | - $s = empty( $_GET['s'] ) ? '' : wp_unslash( $_GET['s'] ); // phpcs:ignore WordPress.Security.NonceVerification, WordPress.Security.ValidatedSanitizedInput | |
| 183 | + // Load translations | |
| 184 | + foreach ( $this->languages as $language ) { | |
| 185 | + // Filters by language if requested | |
| 186 | + if ( ( $lg = get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ) && $language->slug !== $lg ) { | |
| 187 | + continue; | |
| 188 | + } | |
| 265 | 189 | |
| 266 | - if ( ! empty( $s ) ) { | |
| 267 | - // Search in translations | |
| 268 | - $in_translations = $this->search_in_translations( $mo, $s ); | |
| 269 | - | |
| 190 | + $mo = new PLL_MO(); | |
| 191 | + $mo->import_from_db( $language ); | |
| 270 | 192 | foreach ( $data as $key => $row ) { |
| 271 | - if ( stripos( $row['name'], $s ) === false && stripos( $row['string'], $s ) === false && ! in_array( $row['string'], $in_translations ) ) { | |
| 272 | - unset( $data[ $key ] ); | |
| 273 | - } | |
| 193 | + $data[ $key ]['translations'][ $language->slug ] = $mo->translate( $row['string'] ); | |
| 194 | + $data[ $key ]['row'] = $key; // Store the row number for convenience | |
| 274 | 195 | } |
| 275 | 196 | } |
| 276 | 197 | |
| 277 | - // Sorting | |
| 278 | - uasort( $data, array( $this, 'usort_reorder' ) ); | |
| 279 | - | |
| 280 | - // Paging | |
| 281 | 198 | $per_page = $this->get_items_per_page( 'pll_strings_per_page' ); |
| 282 | 199 | $this->_column_headers = array( $this->get_columns(), array(), $this->get_sortable_columns() ); |
| 283 | 200 | |
| 201 | + if ( ! empty( $_GET['orderby'] ) ) { // No sort by default | |
| 202 | + usort( $data, array( $this, 'usort_reorder' ) ); | |
| 203 | + } | |
| 204 | + | |
| 284 | 205 | $total_items = count( $data ); |
| 285 | - $this->items = array_slice( $data, ( $this->get_pagenum() - 1 ) * $per_page, $per_page, true ); | |
| 206 | + $this->items = array_slice( $data, ( $this->get_pagenum() - 1 ) * $per_page, $per_page ); | |
| 286 | 207 | |
| 287 | 208 | $this->set_pagination_args( |
| 288 | 209 | array( |
| 289 | 210 | 'total_items' => $total_items, |
| @@ -290,25 +211,16 @@ | ||
| 290 | 211 | 'per_page' => $per_page, |
| 291 | 212 | 'total_pages' => ceil( $total_items / $per_page ), |
| 292 | 213 | ) |
| 293 | 214 | ); |
| 294 | - | |
| 295 | - // Translate strings | |
| 296 | - // Kept for the end as it is a slow process | |
| 297 | - foreach ( $languages as $language ) { | |
| 298 | - foreach ( $this->items as $key => $row ) { | |
| 299 | - $this->items[ $key ]['translations'][ $language->slug ] = $mo[ $language->slug ]->translate( $row['string'] ); | |
| 300 | - $this->items[ $key ]['row'] = $key; // Store the row number for convenience | |
| 301 | - } | |
| 302 | - } | |
| 303 | 215 | } |
| 304 | 216 | |
| 305 | 217 | /** |
| 306 | - * Get the list of possible bulk actions. | |
| 218 | + * Get the list of possible bulk actions | |
| 307 | 219 | * |
| 308 | 220 | * @since 1.1 |
| 309 | 221 | * |
| 310 | - * @return string[] Array of bulk actions. | |
| 222 | + * @return array | |
| 311 | 223 | */ |
| 312 | 224 | public function get_bulk_actions() { |
| 313 | 225 | return array( 'delete' => __( 'Delete', 'polylang' ) ); |
| 314 | 226 | } |
| @@ -321,9 +233,9 @@ | ||
| 321 | 233 | * |
| 322 | 234 | * @return string|false The action name or False if no action was selected |
| 323 | 235 | */ |
| 324 | 236 | public function current_action() { |
| 325 | - return empty( $_POST['submit'] ) ? parent::current_action() : false; // phpcs:ignore WordPress.Security.NonceVerification | |
| 237 | + return empty( $_POST['submit'] ) ? parent::current_action() : false; | |
| 326 | 238 | } |
| 327 | 239 | |
| 328 | 240 | /** |
| 329 | 241 | * Displays the dropdown list to filter strings per group |
| @@ -330,9 +242,8 @@ | ||
| 330 | 242 | * |
| 331 | 243 | * @since 1.1 |
| 332 | 244 | * |
| 333 | 245 | * @param string $which only 'top' is supported |
| 334 | - * @return void | |
| 335 | 246 | */ |
| 336 | 247 | public function extra_tablenav( $which ) { |
| 337 | 248 | if ( 'top' !== $which ) { |
| 338 | 249 | return; |
| @@ -346,9 +257,9 @@ | ||
| 346 | 257 | ); |
| 347 | 258 | echo '<select id="select-group" name="group">' . "\n"; |
| 348 | 259 | printf( |
| 349 | 260 | '<option value="-1"%s>%s</option>' . "\n", |
| 350 | - selected( $this->selected_group, -1, false ), | |
| 261 | + -1 === $this->group_selected ? ' selected="selected"' : '', | |
| 351 | 262 | esc_html__( 'View all groups', 'polylang' ) |
| 352 | 263 | ); |
| 353 | 264 | |
| 354 | 265 | foreach ( $this->groups as $group ) { |
| @@ -354,15 +265,15 @@ | ||
| 354 | 265 | foreach ( $this->groups as $group ) { |
| 355 | 266 | printf( |
| 356 | 267 | '<option value="%s"%s>%s</option>' . "\n", |
| 357 | 268 | esc_attr( urlencode( $group ) ), |
| 358 | - selected( $this->selected_group, $group, false ), | |
| 269 | + $this->selected_group === $group ? ' selected="selected"' : '', | |
| 359 | 270 | esc_html( $group ) |
| 360 | 271 | ); |
| 361 | 272 | } |
| 362 | 273 | echo '</select>' . "\n"; |
| 363 | 274 | |
| 364 | - submit_button( __( 'Filter', 'polylang' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); | |
| 275 | + submit_button( __( 'Filter' ), 'button', 'filter_action', false, array( 'id' => 'post-query-submit' ) ); | |
| 365 | 276 | echo '</div>'; |
| 366 | 277 | } |
| 367 | 278 | |
| 368 | 279 | /** |
| @@ -369,10 +280,8 @@ | ||
| 369 | 280 | * Saves the strings translations in DB |
| 370 | 281 | * Optionaly clean the DB |
| 371 | 282 | * |
| 372 | 283 | * @since 1.9 |
| 373 | - * | |
| 374 | - * @return void | |
| 375 | 284 | */ |
| 376 | 285 | public function save_translations() { |
| 377 | 286 | check_admin_referer( 'string-translation', '_wpnonce_string-translation' ); |
| 378 | 287 | |
| @@ -377,9 +286,9 @@ | ||
| 377 | 286 | check_admin_referer( 'string-translation', '_wpnonce_string-translation' ); |
| 378 | 287 | |
| 379 | 288 | if ( ! empty( $_POST['submit'] ) ) { |
| 380 | 289 | foreach ( $this->languages as $language ) { |
| 381 | - if ( empty( $_POST['translation'][ $language->slug ] ) || ! is_array( $_POST['translation'][ $language->slug ] ) ) { // In case the language filter is active ( thanks to John P. Bloch ) | |
| 290 | + if ( empty( $_POST['translation'][ $language->slug ] ) ) { // In case the language filter is active ( thanks to John P. Bloch ) | |
| 382 | 291 | continue; |
| 383 | 292 | } |
| 384 | 293 | |
| 385 | 294 | $mo = new PLL_MO(); |
| @@ -384,20 +293,18 @@ | ||
| 384 | 293 | |
| 385 | 294 | $mo = new PLL_MO(); |
| 386 | 295 | $mo->import_from_db( $language ); |
| 387 | 296 | |
| 388 | - $translations = array_map( 'trim', wp_unslash( $_POST['translation'][ $language->slug ] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized | |
| 389 | - foreach ( $translations as $key => $translation ) { | |
| 297 | + foreach ( $_POST['translation'][ $language->slug ] as $key => $translation ) { | |
| 390 | 298 | /** |
| 391 | 299 | * Filter the string translation before it is saved in DB |
| 392 | 300 | * Allows to sanitize strings registered with pll_register_string |
| 393 | 301 | * |
| 394 | 302 | * @since 1.6 |
| 395 | - * @since 2.7 The translation passed to the filter is unslashed. | |
| 396 | 303 | * |
| 397 | - * @param string $translation The string translation. | |
| 398 | - * @param string $name The name as defined in pll_register_string. | |
| 399 | - * @param string $context The context as defined in pll_register_string. | |
| 304 | + * @param string $translation the string translation | |
| 305 | + * @param string $name the name as defined in pll_register_string | |
| 306 | + * @param string $context the context as defined in pll_register_string | |
| 400 | 307 | */ |
| 401 | 308 | $translation = apply_filters( 'pll_sanitize_string_translation', $translation, $this->strings[ $key ]['name'], $this->strings[ $key ]['context'] ); |
| 402 | 309 | $mo->add_entry( $mo->make_entry( $this->strings[ $key ]['string'], $translation ) ); |
| 403 | 310 | } |
| @@ -425,9 +332,9 @@ | ||
| 425 | 332 | } |
| 426 | 333 | |
| 427 | 334 | // Unregisters strings registered through WPML API |
| 428 | 335 | if ( $this->current_action() === 'delete' && ! empty( $_POST['strings'] ) && function_exists( 'icl_unregister_string' ) ) { |
| 429 | - foreach ( array_map( 'sanitize_key', $_POST['strings'] ) as $key ) { | |
| 336 | + foreach ( $_POST['strings'] as $key ) { | |
| 430 | 337 | icl_unregister_string( $this->strings[ $key ]['context'], $this->strings[ $key ]['name'] ); |
| 431 | 338 | } |
| 432 | 339 | } |
| 433 | 340 | |
