← All changes | admin/admin-base.php +48 -81 2.8.2 → 2.4 View file →

		@@ -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,23 @@
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	+ 'classic-editor' => array( array( 'post', 'media', 'async-upload' ), array( 'jquery', 'wp-ajax-response', 'post', 'jquery-ui-autocomplete' ), 0, 1 ),
	122	+ 'post' => array( array( 'edit' ), array( 'jquery', 'wp-ajax-response' ), 0, 1 ),
	123	+ 'media' => array( array( 'upload' ), array( 'jquery' ), 0, 1 ),
	124	+ 'term' => array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 ),
	125	+ 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ),
	126	+ 'widgets' => array( array( 'widgets' ), array( 'jquery' ), 0, 0 ),
130	127	);
131	128
132		- 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 );
134		-
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 );
138		- }
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		- }
145		-
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	129	foreach ( $scripts as $script => $v ) {
151	130	if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) {
152	131	wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] );
153	132	}
		@@ -214,9 +193,9 @@
214	193	$params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) );
215	194	}
216	195
217	196	$str = http_build_query( $params );
218		- $arr = wp_json_encode( $params );
	197	+ $arr = json_encode( $params );
219	198	?>
220	199	<script type="text/javascript">
221	200	if (typeof jQuery != 'undefined') {
222	201	(function($){
		@@ -222,25 +201,25 @@
222	201	(function($){
223	202	$.ajaxPrefilter(function (options, originalOptions, jqXHR) {
224	203	if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
225	204	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 ?>;
	205	+ options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; ?>' : <?php echo $arr; ?>;
227	206	} else {
228	207	if ( 'string' === typeof options.data ) {
229	208	if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
230		- options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>';
	209	+ options.url = options.url+'&<?php echo $str; ?>';
231	210	} else {
232	211	try {
233	212	var o = $.parseJSON(options.data);
234		- o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
	213	+ o = $.extend(o, <?php echo $arr; ?>);
235	214	options.data = JSON.stringify(o);
236	215	}
237	216	catch(e) {
238		- options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data;
	217	+ options.data = '<?php echo $str; ?>&'+options.data;
239	218	}
240	219	}
241	220	} else {
242		- options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
	221	+ options.data = $.extend(options.data, <?php echo $arr; ?>);
243	222	}
244	223	}
245	224	}
246	225	});
		@@ -258,25 +237,25 @@
258	237	public function set_current_language() {
259	238	$this->curlang = $this->filter_lang;
260	239
261	240	// 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
	241	+ if ( isset( $_REQUEST['pll_post_id'] ) && $lang = $this->model->post->get_language( (int) $_REQUEST['pll_post_id'] ) ) {
263	242	$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
	243	+ } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && is_numeric( $_GET['post'] ) && $lang = $this->model->post->get_language( (int) $_GET['post'] ) ) {
265	244	$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
	245	+ } elseif ( 'post-new.php' === $GLOBALS['pagenow'] && ( empty( $_GET['post_type'] ) || $this->model->is_translated_post_type( $_GET['post_type'] ) ) ) {
	246	+ $this->curlang = empty( $_GET['new_lang'] ) ? $this->pref_lang : $this->model->get_language( $_GET['new_lang'] );
268	247	}
269	248
270	249	// Edit Term
271	250	// 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
	251	+ 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	252	$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
	253	+ } elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) {
275	254	$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
	255	+ } elseif ( 'edit-tags.php' === $GLOBALS['pagenow'] && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( $_GET['taxonomy'] ) ) {
	256	+ if ( ! empty( $_GET['new_lang'] ) ) {
	257	+ $this->curlang = $this->model->get_language( $_GET['new_lang'] );
279	258	} elseif ( empty( $this->curlang ) ) {
280	259	$this->curlang = $this->pref_lang;
281	260	}
282	261	}
		@@ -281,10 +260,10 @@
281	260	}
282	261	}
283	262
284	263	// 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
	264	+ if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) {
	265	+ $this->curlang = $this->model->get_language( $_REQUEST['lang'] );
287	266	}
288	267	}
289	268
290	269	/**
		@@ -294,11 +273,10 @@
294	273	*/
295	274	public function init_user() {
296	275	// Language for admin language filter: may be empty
297	276	// $_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
	277	+ if ( ! wp_doing_ajax() && ! empty( $_GET['lang'] ) && ! is_numeric( $_GET['lang'] ) && current_user_can( 'edit_user', $user_id = get_current_user_id() ) ) {
	278	+ update_user_meta( $user_id, 'pll_filter_content', ( $lang = $this->model->get_language( $_GET['lang'] ) ) ? $lang->slug : '' );
301	279	}
302	280
303	281	$this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) );
304	282
		@@ -369,29 +347,18 @@
369	347	__( 'Filters content by language', 'polylang' ),
370	348	esc_html( $selected->name )
371	349	);
372	350
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() ) );
	351	+ $wp_admin_bar->add_menu(
	352	+ array(
	353	+ 'id' => 'languages',
	354	+ 'title' => $selected->flag . $title,
	355	+ 'href' => esc_url( add_query_arg( 'lang', $selected->slug, remove_query_arg( 'paged' ) ) ),
	356	+ 'meta' => array( 'title' => __( 'Filters content by language', 'polylang' ) ),
	357	+ )
	358	+ );
381	359
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 ) {
	360	+ foreach ( array_merge( array( $all_item ), $this->model->get_languages_list() ) as $lang ) {
394	361	if ( $selected->slug === $lang->slug ) {
395	362	continue;
396	363	}
397	364