← All changes | admin/admin-base.php +82 -107 2.9 → 2.5.2 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	*
		@@ -21,8 +18,11 @@
21	18	*/
22	19	public function __construct( &$links_model ) {
23	20	parent::__construct( $links_model );
24	21
	22	+ // Plugin i18n, only needed for backend
	23	+ load_plugin_textdomain( 'polylang', false, basename( POLYLANG_DIR ) . '/languages' );
	24	+
25	25	// Adds the link to the languages panel in the WordPress admin menu
26	26	add_action( 'admin_menu', array( $this, 'add_menus' ) );
27	27
28	28	// Setup js scripts and css styles
		@@ -29,8 +29,13 @@
29	29	add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
30	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
31	31
32	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	+ }
33	38	}
34	39
35	40	/**
36	41	* Setups filters and action needed on all admin pages and on plugins page
		@@ -38,16 +43,13 @@
38	43	*
39	44	* @since 1.2
40	45	*/
41	46	public function init() {
42		- parent::init();
43		-
44		- $this->notices = new PLL_Admin_Notices( $this );
45		-
46	47	if ( ! $this->model->get_languages_list() ) {
47	48	return;
48	49	}
49	50
	51	+ $this->notices = new PLL_Admin_Notices( $this );
50	52	$this->links = new PLL_Admin_Links( $this ); // FIXME needed here ?
51	53	$this->static_pages = new PLL_Admin_Static_Pages( $this ); // FIXME needed here ?
52	54	$this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ?
53	55
		@@ -52,9 +54,9 @@
52	54	$this->filters_links = new PLL_Filters_Links( $this ); // FIXME needed here ?
53	55
54	56	// Filter admin language for users
55	57	// We must not call user info before WordPress defines user roles in wp-settings.php
56		- add_action( 'setup_theme', array( $this, 'init_user' ) );
	58	+ add_filter( 'setup_theme', array( $this, 'init_user' ) );
57	59	add_filter( 'request', array( $this, 'request' ) );
58	60
59	61	// Adds the languages in admin bar
60	62	add_action( 'admin_bar_menu', array( $this, 'admin_bar_menu' ), 100 ); // 100 determines the position
		@@ -65,10 +67,8 @@
65	67	*
66	68	* @since 0.1
67	69	*/
68	70	public function add_menus() {
69		- global $admin_page_hooks;
70		-
71	71	// Prepare the list of tabs
72	72	$tabs = array( 'lang' => __( 'Languages', 'polylang' ) );
73	73
74	74	// Only if at least one language has been created
		@@ -86,16 +86,13 @@
86	86	* @param array $tabs list of tab names
87	87	*/
88	88	$tabs = apply_filters( 'pll_settings_tabs', $tabs );
89	89
90		- $parent = '';
91		-
92	90	foreach ( $tabs as $tab => $title ) {
93	91	$page = 'lang' === $tab ? 'mlang' : "mlang_$tab";
94	92	if ( empty( $parent ) ) {
95	93	$parent = $page;
96	94	add_menu_page( $title, __( 'Languages', 'polylang' ), 'manage_options', $page, null, 'dashicons-translation' );
97		- $admin_page_hooks[ $page ] = 'languages'; // Hack to avoid the localization of the hook name. See: https://core.trac.wordpress.org/ticket/18857
98	95	}
99	96
100	97	add_submenu_page( $parent, $title, $title, 'manage_options', $page, array( $this, 'languages_page' ) );
101	98	}
		@@ -113,38 +110,31 @@
113	110	}
114	111
115	112	$suffix = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
116	113
117		- /*
118		- * For each script:
119		- * 0 => the pages on which to load the script
120		- * 1 => the scripts it needs to work
121		- * 2 => 1 if loaded even if languages have not been defined yet, 0 otherwise
122		- * 3 => 1 if loaded in footer
123		- */
	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
124	120	$scripts = array(
125		- 'user' => array( array( 'profile', 'user-edit' ), array( 'jquery' ), 0, 0 ),
126		- '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 ),
127	126	);
128	127
129	128	if ( ! empty( $screen->post_type ) && $this->model->is_translated_post_type( $screen->post_type ) ) {
130		- $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 );
131	130
132		- // Classic editor.
133		- if ( ! method_exists( $screen, 'is_block_editor' ) || ! $screen->is_block_editor() ) {
134		- $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 );
135	134	}
136		-
137		- // Block editor with legacy metabox in WP 5.0+.
138		- if ( method_exists( $screen, 'is_block_editor' ) && $screen->is_block_editor() && ! pll_use_block_editor_plugin() ) {
139		- $scripts['block-editor'] = array( array( 'post' ), array( 'jquery', 'wp-ajax-response', 'wp-api-fetch' ), 0, 1 );
140		- }
141	135	}
142	136
143		- if ( ! empty( $screen->taxonomy ) && $this->model->is_translated_taxonomy( $screen->taxonomy ) ) {
144		- $scripts['term'] = array( array( 'edit-tags', 'term' ), array( 'jquery', 'wp-ajax-response', 'jquery-ui-autocomplete' ), 0, 1 );
145		- }
146		-
147	137	foreach ( $scripts as $script => $v ) {
148	138	if ( in_array( $screen->base, $v[0] ) && ( $v[2] || $this->model->get_languages_list() ) ) {
149	139	wp_enqueue_script( 'pll_' . $script, plugins_url( '/js/' . $script . $suffix . '.js', POLYLANG_FILE ), $v[1], POLYLANG_VERSION, $v[3] );
150	140	}
		@@ -211,40 +201,38 @@
211	201	$params = array_merge( $params, array( 'pll_term_id' => (int) $tag_ID ) );
212	202	}
213	203
214	204	$str = http_build_query( $params );
215		- $arr = wp_json_encode( $params );
	205	+ $arr = json_encode( $params );
216	206	?>
217	207	<script type="text/javascript">
218	208	if (typeof jQuery != 'undefined') {
219		- jQuery(
220		- function($){
221		- $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
222		- if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
223		- if ( 'undefined' === typeof options.data ) {
224		- options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>' : <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>;
225		- } else {
226		- if ( 'string' === typeof options.data ) {
227		- if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
228		- options.url = options.url+'&<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>';
229		- } else {
230		- try {
231		- var o = JSON.parse(options.data);
232		- o = $.extend(o, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
233		- options.data = JSON.stringify(o);
234		- }
235		- catch(e) {
236		- options.data = '<?php echo $str; // phpcs:ignore WordPress.Security.EscapeOutput ?>&'+options.data;
237		- }
	209	+ (function($){
	210	+ $.ajaxPrefilter(function (options, originalOptions, jqXHR) {
	211	+ if ( -1 != options.url.indexOf( ajaxurl ) || -1 != ajaxurl.indexOf( options.url ) ) {
	212	+ if ( 'undefined' === typeof options.data ) {
	213	+ options.data = ( 'get' === options.type.toLowerCase() ) ? '<?php echo $str; ?>' : <?php echo $arr; ?>;
	214	+ } else {
	215	+ if ( 'string' === typeof options.data ) {
	216	+ if ( '' === options.data && 'get' === options.type.toLowerCase() ) {
	217	+ options.url = options.url+'&<?php echo $str; ?>';
	218	+ } else {
	219	+ try {
	220	+ var o = $.parseJSON(options.data);
	221	+ o = $.extend(o, <?php echo $arr; ?>);
	222	+ options.data = JSON.stringify(o);
238	223	}
239		- } else {
240		- options.data = $.extend(options.data, <?php echo $arr; // phpcs:ignore WordPress.Security.EscapeOutput ?>);
	224	+ catch(e) {
	225	+ options.data = '<?php echo $str; ?>&'+options.data;
	226	+ }
241	227	}
	228	+ } else {
	229	+ options.data = $.extend(options.data, <?php echo $arr; ?>);
242	230	}
243	231	}
244		- });
245		- }
246		- );
	232	+ }
	233	+ });
	234	+ })(jQuery)
247	235	}
248	236	</script>
249	237	<?php
250	238	}
		@@ -257,24 +245,25 @@
257	245	public function set_current_language() {
258	246	$this->curlang = $this->filter_lang;
259	247
260	248	// Edit Post
261		- 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'] ) ) {
262	250	$this->curlang = $lang;
263		- } elseif ( 'post.php' === $GLOBALS['pagenow'] && isset( $_GET['post'] ) && $this->model->is_translated_post_type( get_post_type( (int) $_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'] ) ) {
264	252	$this->curlang = $lang;
265		- } 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
266		- $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'] );
267	255	}
268	256
269	257	// Edit Term
270		- elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
	258	+ // FIXME 'edit-tags.php' for backward compatibility with WP < 4.5
	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'] ) ) {
271	260	$this->curlang = $lang;
272		- } elseif ( in_array( $GLOBALS['pagenow'], array( 'edit-tags.php', 'term.php' ) ) && isset( $_GET['taxonomy'] ) && $this->model->is_translated_taxonomy( sanitize_key( $_GET['taxonomy'] ) ) ) { // phpcs:ignore WordPress.Security.NonceVerification
273		- if ( isset( $_GET['tag_ID'] ) && $lang = $this->model->term->get_language( (int) $_GET['tag_ID'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
274		- $this->curlang = $lang;
275		- } elseif ( ! empty( $_GET['new_lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
276		- $this->curlang = $this->model->get_language( sanitize_key( $_GET['new_lang'] ) ); // phpcs:ignore WordPress.Security.NonceVerification
	261	+ } elseif ( isset( $_REQUEST['pll_term_id'] ) && $lang = $this->model->term->get_language( (int) $_REQUEST['pll_term_id'] ) ) {
	262	+ $this->curlang = $lang;
	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'] );
277	266	} elseif ( empty( $this->curlang ) ) {
278	267	$this->curlang = $this->pref_lang;
279	268	}
280	269	}
		@@ -279,20 +268,11 @@
279	268	}
280	269	}
281	270
282	271	// Ajax
283		- if ( wp_doing_ajax() && ! empty( $_REQUEST['lang'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification
284		- $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'] );
285	274	}
286		-
287		- // Inform that the admin language has been set.
288		- if ( $this->curlang ) {
289		- /** This action is documented in frontend/choose-lang.php */
290		- do_action( 'pll_language_defined', $this->curlang->slug, $this->curlang );
291		- } else {
292		- /** This action is documented in include/class-polylang.php */
293		- do_action( 'pll_no_language_defined' ); // To load overridden textdomains.
294		- }
295	275	}
296	276
297	277	/**
298	278	* Defines the backend language and the admin language filter based on user preferences
		@@ -301,11 +281,10 @@
301	281	*/
302	282	public function init_user() {
303	283	// Language for admin language filter: may be empty
304	284	// $_GET['lang'] is numeric when editing a language, not when selecting a new language in the filter
305		- // We intentionally don't use a nonce to update the language filter
306		- 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
307		- 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 : '' );
308	287	}
309	288
310	289	$this->filter_lang = $this->model->get_language( get_user_meta( get_current_user_id(), 'pll_filter_content', true ) );
311	290
		@@ -323,10 +302,17 @@
323	302	$this->pref_lang = apply_filters( 'pll_admin_preferred_language', $this->pref_lang );
324	303
325	304	$this->set_current_language();
326	305
327		- // Plugin i18n, only needed for backend.
328		- load_plugin_textdomain( 'polylang' );
	306	+ // Inform that the admin language has been set
	307	+ // Only if the admin language is one of the Polylang defined language
	308	+ if ( $curlang = $this->model->get_language( get_user_locale() ) ) {
	309	+ /** This action is documented in frontend/choose-lang.php */
	310	+ do_action( 'pll_language_defined', $curlang->slug, $curlang );
	311	+ } else {
	312	+ /** This action is documented in include/class-polylang.php */
	313	+ do_action( 'pll_no_language_defined' ); // to load overridden textdomains
	314	+ }
329	315	}
330	316
331	317	/**
332	318	* Avoids parsing a tax query when all languages are requested
		@@ -331,9 +317,9 @@
331	317	/**
332	318	* Avoids parsing a tax query when all languages are requested
333	319	* Fixes https://wordpress.org/support/topic/notice-undefined-offset-0-in-wp-includesqueryphp-on-line-3877 introduced in WP 4.1
334	320	*
335		- * @see https://core.trac.wordpress.org/ticket/31246 the suggestion of @boonebgorges.
	321	+ * @see the suggestion of @boonebgorges, https://core.trac.wordpress.org/ticket/31246
336	322	*
337	323	* @since 1.6.5
338	324	*
339	325	* @param array $qvars
		@@ -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