| @@ -1,8 +1,5 @@ | ||
| 1 | 1 | <?php |
| 2 | -/** | |
| 3 | - * @package Polylang | |
| 4 | - */ | |
| 5 | 2 | |
| 6 | 3 | /** |
| 7 | 4 | * Base class for both admin |
| 8 | 5 | * |
| @@ -22,9 +19,9 @@ | ||
| 22 | 19 | public function __construct( &$links_model ) { |
| 23 | 20 | parent::__construct( $links_model ); |
| 24 | 21 | |
| 25 | 22 | // Plugin i18n, only needed for backend |
| 26 | - load_plugin_textdomain( 'polylang' ); | |
| 23 | + load_plugin_textdomain( 'polylang', false, basename( POLYLANG_DIR ) . '/languages' ); | |
| 27 | 24 | |
| 28 | 25 | // Adds the link to the languages panel in the WordPress admin menu |
| 29 | 26 | add_action( 'admin_menu', array( $this, 'add_menus' ) ); |
| 30 | 27 | |
| @@ -32,8 +29,13 @@ | ||
| 32 | 29 | add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) ); |
| 33 | 30 | add_action( 'admin_print_footer_scripts', array( $this, 'admin_print_footer_scripts' ), 0 ); // High priority in case an ajax request is sent by an immediately invoked function |
| 34 | 31 | |
| 35 | 32 | add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_controls_enqueue_scripts' ) ); |
| 33 | + | |
| 34 | + // Lingotek | |
| 35 | + if ( ! defined( 'POLYLANG_PRO' ) && ( ! defined( 'PLL_LINGOTEK_AD' ) || PLL_LINGOTEK_AD ) ) { | |
| 36 | + require_once POLYLANG_DIR . '/lingotek/lingotek.php'; | |
| 37 | + } | |
| 36 | 38 | } |
| 37 | 39 | |
| 38 | 40 | /** |
| 39 | 41 | * Setups filters and action needed on all admin pages and on plugins page |
| @@ -41,16 +43,13 @@ | ||
| 41 | 43 | * |
| 42 | 44 | * @since 1.2 |
| 43 | 45 | */ |
| 44 | 46 | public function init() { |
| 45 | - parent::init(); | |
| 46 | - | |
| 47 | - $this->notices = new PLL_Admin_Notices( $this ); | |
| 48 | - | |
| 49 | 47 | if ( ! $this->model->get_languages_list() ) { |
| 50 | 48 | return; |
| 51 | 49 | } |
| 52 | 50 | |
| 51 | + $this->notices = new PLL_Admin_Notices( $this ); | |
| 53 | 52 | $this->links = new PLL_Admin_Links( $this ); // FIXME needed here ? |
| 54 | 53 | $this->static_pages = new PLL_Admin_Static_Pages( $this ); // FIXME needed here ? |
| 55 | 54 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 56 | 55 | |
| @@ -55,9 +54,9 @@ | ||
| 55 | 54 | $this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ? |
| 56 | 55 | |
| 57 | 56 | // Filter admin language for users |
| 58 | 57 | // We must not call user info before WordPress defines user roles in wp-settings.php |
| 59 | - add_action( 'setup_theme', array( $this, 'init_user' ) ); | |
| 58 | + add_filter( 'setup_theme', array( $this, 'init_user' ) ); | |
| 60 | 59 | add_filter( 'request', array( $this, 'request' ) ); |
| 61 | 60 | |
| 62 | 61 | // Adds the languages in admin bar |
| 63 | 62 | add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 ); // 100 determines the position |
| @@ -68,10 +67,8 @@ | ||
| 68 | 67 | * |
| 69 | 68 | * @since 0.1 |
| 70 | 69 | */ |
| 71 | 70 | public function add_menus() { |
| 72 | - global $admin_page_hooks; | |
| 73 | - | |
| 74 | 71 | // Prepare the list of tabs |
| 75 | 72 | $tabs = array( 'lang' => __( 'Languages', 'polylang' ) ); |
| 76 | 73 | |
| 77 | 74 | // Only if at least one language has been created |
| @@ -89,16 +86,13 @@ | ||
| 89 | 86 | * @param array $tabs list of tab names |
| 90 | 87 | */ |
| 91 | 88 | $tabs = apply_filters( 'pll_settings_tabs', $tabs ); |
| 92 | 89 | |
| 93 | - $parent = ''; | |
| 94 | - | |
| 95 | 90 | foreach ( $tabs as $tab => $title ) { |
| 96 | 91 | $page = 'lang' === $tab ? 'mlang' : "mlang_$tab"; |
| 97 | 92 | if ( empty( $parent ) ) { |
| 98 | 93 | $parent = $page; |
| 99 | 94 | add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, null, 'dashicons-translation' ); |
| 100 | - $admin_page_hooks[ $page ] = 'languages'; // Hack to avoid the localization of the hook name. See: https://core.trac.wordpress.org/ticket/18857 | |
| 101 | 95 | } |
| 102 | 96 | |
| 103 | 97 | add_submenu_page( $parent, $title, $title, 'manage_options', $page, array( $this, 'languages_page' ) ); |
| 104 | 98 | } |
| @@ -116,38 +110,31 @@ | ||
| 116 | 110 | } |
| 117 | 111 | |
| 118 | 112 | $suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; |
| 119 | 113 | |
| 120 | - /* | |
| 121 | - * For each script: | |
| 122 | - * 0 => the pages on which to load the script | |
| 123 | - * 1 => the scripts it needs to work | |
| 124 | - * 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 125 | - * 3 => 1 if loaded in footer | |
| 126 | - */ | |
| 114 | + // For each script: | |
| 115 | + // 0 => the pages on which to load the script | |
| 116 | + // 1 => the scripts it needs to work | |
| 117 | + // 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise | |
| 118 | + // 3 => 1 if loaded in footer | |
| 119 | + // FIXME: check if I can load more scripts in footer | |
| 127 | 120 | $scripts = array( |
| 128 | - 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 129 | - 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 121 | + 'post' => array( array( 'edit' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ), | |
| 122 | + 'media' => array( array( 'upload' ), array( 'jquery' ), 0, 1 ), | |
| 123 | + 'term' => array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ), | |
| 124 | + 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ), | |
| 125 | + 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ), | |
| 130 | 126 | ); |
| 131 | 127 | |
| 132 | 128 | if ( ! empty( $screen->post_type ) && $this->model->is_translated_post_type( $screen->post_type ) ) { |
| 133 | - $scripts['post'] = array( array( 'edit', 'upload' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ); | |
| 129 | + $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-autocomplete' ), 0, 1 ); | |
| 134 | 130 | |
| 135 | - // Classic editor. | |
| 136 | - if ( ! method_exists( $screen, 'is_block_editor' ) || ! $screen->is_block_editor() ) { | |
| 137 | - $scripts['classic-editor'] = array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post' ), 0, 1 ); | |
| 131 | + // Block editor in WP 5.0+ | |
| 132 | + if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() ) { | |
| 133 | + $scripts['block-editor'] = array( array( 'post' ), array( 'wp-api-fetch' ), 0, 1 ); | |
| 138 | 134 | } |
| 139 | - | |
| 140 | - // Block editor with legacy metabox in WP 5.0+. | |
| 141 | - if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin() ) { | |
| 142 | - $scripts['block-editor'] = array( array( 'post' ), array( 'jquery', 'wp-ajax-response', 'wp-api-fetch' ), 0, 1 ); | |
| 143 | - } | |
| 144 | 135 | } |
| 145 | 136 | |
| 146 | - if ( ! empty( $screen->taxonomy ) && $this->model->is_translated_taxonomy( $screen->taxonomy ) ) { | |
| 147 | - $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ); | |
| 148 | - } | |
| 149 | - | |
| 150 | 137 | foreach ( $scripts as $script => $v ) { |
| 151 | 138 | if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) { |
| 152 | 139 | wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] ); |
| 153 | 140 | } |
| @@ -214,9 +201,9 @@ | ||
| 214 | 201 | $params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) ); |
| 215 | 202 | } |
| 216 | 203 | |
| 217 | 204 | $str = http_build_query( $params ); |
| 218 | - $arr = wp_json_encode( $params ); | |
| 205 | + $arr = json_encode( $params ); | |
| 219 | 206 | ?> |
| 220 | 207 | <script type="text/javascript"> |
| 221 | 208 | if (typeof jQuery != 'undefined') { |
| 222 | 209 | (function($){ |
| @@ -222,25 +209,25 @@ | ||
| 222 | 209 | (function($){ |
| 223 | 210 | $.ajaxPrefilter(function (options, originalOptions, jqXHR) { |
| 224 | 211 | if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) { |
| 225 | 212 | if ( 'undefined' === typeof options.data ) { |
| 226 | - options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>; | |
| 213 | + options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; ?>' : <?php echo $arr; ?>; | |
| 227 | 214 | } else { |
| 228 | 215 | if ( 'string' === typeof options.data ) { |
| 229 | 216 | if ( '' === options.data && 'get' === options.type.toLowerCase() ) { |
| 230 | - options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>'; | |
| 217 | + options.url = options.url+'&<?php echo $str; ?>'; | |
| 231 | 218 | } else { |
| 232 | 219 | try { |
| 233 | 220 | var o = $.parseJSON(options.data); |
| 234 | - o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>); | |
| 221 | + o = $.extend(o, <?php echo $arr; ?>); | |
| 235 | 222 | options.data = JSON.stringify(o); |
| 236 | 223 | } |
| 237 | 224 | catch(e) { |
| 238 | - options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data; | |
| 225 | + options.data = '<?php echo $str; ?>&'+options.data; | |
| 239 | 226 | } |
| 240 | 227 | } |
| 241 | 228 | } else { |
| 242 | - options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>); | |
| 229 | + options.data = $.extend(options.data, <?php echo $arr; ?>); | |
| 243 | 230 | } |
| 244 | 231 | } |
| 245 | 232 | } |
| 246 | 233 | }); |
| @@ -258,25 +245,25 @@ | ||
| 258 | 245 | public function set_current_language() { |
| 259 | 246 | $this->curlang = $this->filter_lang; |
| 260 | 247 | |
| 261 | 248 | // Edit Post |
| 262 | - if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 249 | + if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) { | |
| 263 | 250 | $this->curlang = $lang; |
| 264 | - } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 251 | + } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && is_numeric( $_GET['post'] ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) { | |
| 265 | 252 | $this->curlang = $lang; |
| 266 | - } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( sanitize_key( $_GET['post_type'] ) ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 267 | - $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 253 | + } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( $_GET['post_type'] ) ) ) { | |
| 254 | + $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( $_GET['new_lang'] ); | |
| 268 | 255 | } |
| 269 | 256 | |
| 270 | 257 | // Edit Term |
| 271 | 258 | // FIXME 'edit-tags.php' for backward compatibility with WP < 4.5 |
| 272 | - elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 259 | + elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { | |
| 273 | 260 | $this->curlang = $lang; |
| 274 | - } elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 261 | + } elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { | |
| 275 | 262 | $this->curlang = $lang; |
| 276 | - } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( sanitize_key( $_GET['taxonomy'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 277 | - if ( ! empty( $_GET['new_lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 278 | - $this->curlang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 263 | + } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( $_GET['taxonomy'] ) ) { | |
| 264 | + if ( ! empty( $_GET['new_lang'] ) ) { | |
| 265 | + $this->curlang = $this->model->get_language( $_GET['new_lang'] ); | |
| 279 | 266 | } elseif ( empty( $this->curlang ) ) { |
| 280 | 267 | $this->curlang = $this->pref_lang; |
| 281 | 268 | } |
| 282 | 269 | } |
| @@ -281,10 +268,10 @@ | ||
| 281 | 268 | } |
| 282 | 269 | } |
| 283 | 270 | |
| 284 | 271 | // Ajax |
| 285 | - if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 286 | - $this->curlang = $this->model->get_language( sanitize_key( $_REQUEST['lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 272 | + if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { | |
| 273 | + $this->curlang = $this->model->get_language( $_REQUEST['lang'] ); | |
| 287 | 274 | } |
| 288 | 275 | } |
| 289 | 276 | |
| 290 | 277 | /** |
| @@ -294,11 +281,10 @@ | ||
| 294 | 281 | */ |
| 295 | 282 | public function init_user() { |
| 296 | 283 | // Language for admin language filter: may be empty |
| 297 | 284 | // $_GET['lang'] is numeric when editing a language, not when selecting a new language in the filter |
| 298 | - // We intentionally don't use a nonce to update the language filter | |
| 299 | - if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( sanitize_key( $_GET['lang'] ) ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { // phpcs:ignore WordPress.Security.NonceVerification | |
| 300 | - update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( sanitize_key( $_GET['lang'] ) ) ) ? $lang->slug : '' ); // phpcs:ignore WordPress.Security.NonceVerification | |
| 285 | + if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( $_GET['lang'] ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) { | |
| 286 | + update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( $_GET['lang'] ) ) ? $lang->slug : '' ); | |
| 301 | 287 | } |
| 302 | 288 | |
| 303 | 289 | $this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) ); |
| 304 | 290 | |
| @@ -369,29 +355,18 @@ | ||
| 369 | 355 | __( 'Filters content by language', 'polylang' ), |
| 370 | 356 | esc_html( $selected->name ) |
| 371 | 357 | ); |
| 372 | 358 | |
| 373 | - /** | |
| 374 | - * Filters the admin languages filter submenu items | |
| 375 | - * | |
| 376 | - * @since 2.6 | |
| 377 | - * | |
| 378 | - * @param array $items The admin languages filter submenu items. | |
| 379 | - */ | |
| 380 | - $items = apply_filters( 'pll_admin_languages_filter', array_merge( array( $all_item ), $this->model->get_languages_list() ) ); | |
| 359 | + $wp_admin_bar->add_menu( | |
| 360 | + array( | |
| 361 | + 'id' => 'languages', | |
| 362 | + 'title' => $selected->flag . $title, | |
| 363 | + 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 364 | + 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 365 | + ) | |
| 366 | + ); | |
| 381 | 367 | |
| 382 | - if ( ! empty( $items ) ) { | |
| 383 | - $wp_admin_bar->add_menu( | |
| 384 | - array( | |
| 385 | - 'id' => 'languages', | |
| 386 | - 'title' => $selected->flag . $title, | |
| 387 | - 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ), | |
| 388 | - 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ), | |
| 389 | - ) | |
| 390 | - ); | |
| 391 | - } | |
| 392 | - | |
| 393 | - foreach ( $items as $lang ) { | |
| 368 | + foreach ( array_merge( array( $all_item ), $this->model->get_languages_list() ) as $lang ) { | |
| 394 | 369 | if ( $selected->slug === $lang->slug ) { |
| 395 | 370 | continue; |
| 396 | 371 | } |
| 397 | 372 | |
