← All changes | admin/class-wp-media-extends.php +140 -86 3.3.1 → 4.1.2 View file →

		@@ -38,43 +38,44 @@
38	38	public function __construct( $plugin_name, $version ) {
39	39
40	40	$this->plugin_name = $plugin_name;
41	41	$this->version = $version;
42		-
43	42	}
44	43
45		- public function enqueue_scripts(){
46		- global $pagenow;
47		-
48		- if ( get_option('quickwebp_settings_paste_image', quickwebp_settings_default('quickwebp_settings_paste_image')) == '1' ){
	44	+ /**
	45	+ * Enqueue scripts and styles for the media uploader
	46	+ */
	47	+ public function enqueue_scripts( $hook_suffix ){
	48	+ global $post_type;
49	49
50		- $wp_media_extends_assets = include( QUICKWEBP_PLUGIN_PATH . 'public/assets/build/wp-media-extends.asset.php' );
51		- wp_enqueue_style( 'quickwebp-wp-media-extends', QUICKWEBP_PLUGIN_URL . 'public/assets/build/wp-media-extends.css', array(), $wp_media_extends_assets['version'], 'all' );
52		- wp_enqueue_script( 'quickwebp-wp-media-extends', QUICKWEBP_PLUGIN_URL . 'public/assets/build/wp-media-extends.js', $wp_media_extends_assets['dependencies'], $wp_media_extends_assets['version'], true );
53		- wp_localize_script( 'quickwebp-wp-media-extends', 'quickwebp_wp_media_extends', array(
54		- 'is_upload_page' => $pagenow ? $pagenow === 'upload.php' : false,
55		- 'nonce' => wp_create_nonce( 'media-form' ),
56		- 'tmpl_tab_media_paste' => file_get_contents( QUICKWEBP_PLUGIN_PATH . 'admin/templates/tab-media-paste.php' ),
57		- 'tmpl_button_media_paste' => file_get_contents( QUICKWEBP_PLUGIN_PATH . 'admin/templates/button-media-paste.php' ),
58		- 'l10n' => array(
59		- 'prompt_text' => __( 'Please enter the name of your image', QUICKWEBP_TEXT_DOMAIN ),
60		- 'button_text' => __( 'Quickwebp paste image', QUICKWEBP_TEXT_DOMAIN ),
61		- 'click_paste' => __( 'Click here, and paste your image.', QUICKWEBP_TEXT_DOMAIN )
62		- )
	50	+ if ( 'upload.php' === $hook_suffix || ( ! empty( $post_type ) && 'post.php' === $hook_suffix && 'attachment' === $post_type ) ) {
	51	+
	52	+ if ( get_option('quickwebp_settings_paste_image', quickwebp_settings_default('quickwebp_settings_paste_image')) == '1' ){
	53	+
	54	+ $wp_media_extends_assets = include( QUICKWEBP_PLUGIN_PATH . 'public/assets/build/wp-media-extends.asset.php' );
	55	+ wp_enqueue_style( 'quickwebp-wp-media-extends', QUICKWEBP_PLUGIN_URL . 'public/assets/build/wp-media-extends.css', array(), $wp_media_extends_assets['version'], 'all' );
	56	+ wp_enqueue_script( 'quickwebp-wp-media-extends', QUICKWEBP_PLUGIN_URL . 'public/assets/build/wp-media-extends.js', $wp_media_extends_assets['dependencies'], $wp_media_extends_assets['version'], true );
	57	+ wp_localize_script( 'quickwebp-wp-media-extends', 'quickwebp_wp_media_extends', array(
	58	+ 'is_upload_page' => $hook_suffix === 'upload.php',
	59	+ 'nonce' => wp_create_nonce( 'media-form' ),
	60	+ 'tmpl_tab_media_paste' => file_get_contents( QUICKWEBP_PLUGIN_PATH . 'admin/templates/tab-media-paste.php' ),
	61	+ 'tmpl_button_media_paste' => file_get_contents( QUICKWEBP_PLUGIN_PATH . 'admin/templates/button-media-paste.php' ),
	62	+ 'l10n' => array(
	63	+ 'prompt_text' => __( 'Please enter the name of your image', 'quickwebp' ),
	64	+ 'button_text' => __( 'Quickwebp paste image', 'quickwebp' ),
	65	+ 'click_paste' => __( 'Click here, and paste your image.', 'quickwebp' )
	66	+ )
	67	+ ));
	68	+ }
	69	+
	70	+ $admin_attachment_assets = include( QUICKWEBP_PLUGIN_PATH . 'public/assets/build/admin-attachment.asset.php' );
	71	+ wp_enqueue_style( 'quickwebp-admin-attachment', QUICKWEBP_PLUGIN_URL . 'public/assets/build/admin-attachment.css', array(), $admin_attachment_assets['version'], 'all' );
	72	+ wp_enqueue_script( 'quickwebp-admin-attachment', QUICKWEBP_PLUGIN_URL . 'public/assets/build/admin-attachment.js', $admin_attachment_assets['dependencies'], $admin_attachment_assets['version'], true );
	73	+ wp_localize_script( 'quickwebp-admin-attachment', 'QUICKWEBP_ADMIN_ATTACHMENT', array(
	74	+ 'nonce' => wp_create_nonce( 'quickwebp_admin_attachment' ),
	75	+ 'ajaxUrl' => admin_url( 'admin-ajax.php' )
63	76	));
64	77	}
65		-
66		- if ( ! current_user_can( 'upload_files' ) ) {
67		- return;
68		- }
69		-
70		- $admin_attachment_assets = include( QUICKWEBP_PLUGIN_PATH . 'public/assets/build/admin-attachment.asset.php' );
71		- wp_enqueue_style( 'quickwebp-admin-attachment', QUICKWEBP_PLUGIN_URL . 'public/assets/build/admin-attachment.css', array(), $admin_attachment_assets['version'], 'all' );
72		- wp_enqueue_script( 'quickwebp-admin-attachment', QUICKWEBP_PLUGIN_URL . 'public/assets/build/admin-attachment.js', $admin_attachment_assets['dependencies'], $admin_attachment_assets['version'], true );
73		- wp_localize_script( 'quickwebp-admin-attachment', 'QUICKWEBP_ADMIN_ATTACHMENT', array(
74		- 'nonce' => wp_create_nonce( 'quickwebp_admin_attachment' ),
75		- 'ajaxUrl' => admin_url( 'admin-ajax.php' )
76		- ));
77	78	}
78	79
79	80	/**
80	81	* Add "Quickwebp" column in the Media Uploader
		@@ -89,25 +90,47 @@
89	90	if ( ! $this->valid_mimetype( $post->ID ) ) {
90	91	return $form_fields;
91	92	}
92	93
93		- $data = get_post_meta( $post->ID, 'quickwebp_data', true );
94		- $has_error = get_post_meta( $post->ID, 'quickwebp_has_error', true );
	94	+ $image_optimizer = new Quickwebp_Image_Optimizer( $this->plugin_name, $this->version );
	95	+ $settings = $image_optimizer->get_settings();
95	96
96		- if ( ! is_array( $data ) ) {
	97	+ $html = '';
	98	+ $status = '0';
	99	+ $already_optimized = get_post_meta( $post->ID, 'quickwebp_already_optimized', true );
	100	+ $data = get_post_meta( $post->ID, 'quickwebp_data', true );
97	101
98		- $html = $this->optimize_btn( $post->ID );
	102	+ $mode_enabled = $settings['quickwebp_settings_conversion'];
99	103
100		- if ( ! empty( $has_error ) ) {
101		- $html .= '<br>' . esc_html__( 'Error attempting to optimize this image', QUICKWEBP_TEXT_DOMAIN );
	104	+ if ( '1' == $already_optimized && ( '1' == $mode_enabled || '0' == $mode_enabled ) ) {
	105	+ if ( is_array( $data ) ) {
	106	+ $status = '1';
	107	+ } else {
	108	+ $status = '2';
102	109	}
	110	+ }
103	111
104		- } else {
	112	+ if ( '2' == $already_optimized && ( '2' == $mode_enabled || '0' == $mode_enabled ) ) {
	113	+ if ( is_array( $data ) ) {
	114	+ $status = '1';
	115	+ } else {
	116	+ $status = '2';
	117	+ }
	118	+ }
105	119
106		- $html = $this->attachment_data( $data, $post->ID );
	120	+ switch ( $status ) {
	121	+ case '0':
	122	+ $html = $this->optimize_btn( $post->ID );
	123	+ break;
	124	+ case '1':
	125	+ $html = $this->attachment_data( $data, $post->ID );
	126	+ break;
	127	+ case '2':
	128	+ $html = '<br>' . esc_html__( 'Image already optimized.', 'quickwebp' );
	129	+ break;
107	130	}
108	131
109		- $form_fields['quickwebp'] = array(
	132	+ $form_fields['wpmtk_media_encoder'] = array(
110	133	'label' => 'Quickwebp',
111	134	'input' => 'html',
112	135	'html' => $html,
113	136	'show_in_edit' => true,
		@@ -120,11 +143,9 @@
120	143	/**
121	144	* Add "quickwebp" column in upload.php
122	145	*/
123	146	public function add_media_columns( $columns ) {
124		-
125		- $columns['quickwebp'] = __( 'Quickwebp', QUICKWEBP_TEXT_DOMAIN );
126		-
	147	+ $columns['quickwebp'] = 'QuickWebP';
127	148	return $columns;
128	149	}
129	150
130	151	/**
		@@ -136,26 +157,48 @@
136	157	return;
137	158	}
138	159
139	160	if ( ! $this->valid_mimetype( $attachment_id ) ) {
140		- echo esc_html__( 'Image type not supported', QUICKWEBP_TEXT_DOMAIN );
	161	+ echo esc_html__( 'Image type not supported', 'quickwebp' );
141	162	return;
142	163	}
143	164
144		- $data = get_post_meta( $attachment_id, 'quickwebp_data', true );
145		- $has_error = get_post_meta( $attachment_id, 'quickwebp_has_error', true );
	165	+ $image_optimizer = new Quickwebp_Image_Optimizer( $this->plugin_name, $this->version );
	166	+ $settings = $image_optimizer->get_settings();
146	167
147		- if ( ! is_array( $data ) ) {
	168	+ $html = '';
	169	+ $status = '0';
	170	+ $already_optimized = get_post_meta( $attachment_id, 'quickwebp_already_optimized', true );
	171	+ $data = get_post_meta( $attachment_id, 'quickwebp_data', true );
148	172
149		- echo $this->optimize_btn( $attachment_id );
	173	+ $mode_enabled = $settings['quickwebp_settings_conversion'];
150	174
151		- if ( ! empty( $has_error ) ) {
152		- echo esc_html__( 'Error attempting to optimize this image', QUICKWEBP_TEXT_DOMAIN );
	175	+ if ( '1' == $already_optimized && ( '1' == $mode_enabled || '0' == $mode_enabled ) ) {
	176	+ if ( is_array( $data ) ) {
	177	+ $status = '1';
	178	+ } else {
	179	+ $status = '2';
153	180	}
	181	+ }
154	182
155		- } else {
	183	+ if ( '2' == $already_optimized && ( '2' == $mode_enabled || '0' == $mode_enabled ) ) {
	184	+ if ( is_array( $data ) ) {
	185	+ $status = '1';
	186	+ } else {
	187	+ $status = '2';
	188	+ }
	189	+ }
156	190
157		- echo $this->attachment_data( $data, $attachment_id );
	191	+ switch ( $status ) {
	192	+ case '0':
	193	+ echo wp_kses_post( $this->optimize_btn( $attachment_id ) );
	194	+ break;
	195	+ case '1':
	196	+ echo wp_kses_post( $this->attachment_data( $data, $attachment_id ) );
	197	+ break;
	198	+ case '2':
	199	+ echo wp_kses_post( '<br>' . esc_html__( 'Image already optimized.', 'quickwebp' ) );
	200	+ break;
158	201	}
159	202	}
160	203
161	204	/**
		@@ -167,27 +210,47 @@
167	210	if ( ! $this->valid_mimetype( $post->ID ) ) {
168	211	return;
169	212	}
170	213
171		- $data = get_post_meta( $post->ID, 'quickwebp_data', true );
172		- $has_error = get_post_meta( $post->ID, 'quickwebp_has_error', true );
	214	+ $image_optimizer = new Quickwebp_Image_Optimizer( $this->plugin_name, $this->version );
	215	+ $settings = $image_optimizer->get_settings();
173	216
174		- if ( ! is_array( $data ) ) {
	217	+ $html = '';
	218	+ $status = '0';
	219	+ $already_optimized = get_post_meta( $post->ID, 'quickwebp_already_optimized', true );
	220	+ $data = get_post_meta( $post->ID, 'quickwebp_data', true );
175	221
176		- echo '<table><tr><td>';
177		- echo $this->optimize_btn( $post->ID );
	222	+ $mode_enabled = $settings['quickwebp_settings_conversion'];
178	223
179		- if ( ! empty( $has_error ) ) {
180		- echo esc_html__( 'Error attempting to optimize this image', QUICKWEBP_TEXT_DOMAIN );
	224	+ if ( '1' == $already_optimized && ( '1' == $mode_enabled || '0' == $mode_enabled ) ) {
	225	+ if ( is_array( $data ) ) {
	226	+ $status = '1';
	227	+ } else {
	228	+ $status = '2';
181	229	}
	230	+ }
182	231
183		- echo '</td></tr></table>';
	232	+ if ( '2' == $already_optimized && ( '2' == $mode_enabled || '0' == $mode_enabled ) ) {
	233	+ if ( is_array( $data ) ) {
	234	+ $status = '1';
	235	+ } else {
	236	+ $status = '2';
	237	+ }
	238	+ }
184	239
185		- } else {
186		-
187		- echo '<table><tr><td>' . $this->attachment_data( $data, $post->ID ) . '</td></tr></table>';
	240	+ echo '<table><tr><td><div><strong>QuickWebP</strong></div>';
	241	+ switch ( $status ) {
	242	+ case '0':
	243	+ echo wp_kses_post( $this->optimize_btn( $post->ID ) );
	244	+ break;
	245	+ case '1':
	246	+ echo wp_kses_post( $this->attachment_data( $data, $post->ID ) );
	247	+ break;
	248	+ case '2':
	249	+ echo esc_html__( 'Image already optimized.', 'quickwebp' );
	250	+ break;
188	251	}
189		-
	252	+ echo '</td></tr></table>';
190	253	}
191	254
192	255	/**
193	256	* Get all data to display for a specific media
		@@ -192,31 +255,30 @@
192	255	/**
193	256	* Get all data to display for a specific media
194	257	*/
195	258	public function attachment_data( $data, $attachment_id ) {
	259	+ $available_formats = array( '1' => 'WebP', '2' => 'AVIF' );
	260	+ $full_image_data = $data['full'] ?? array();
	261	+ $format = $available_formats[ $full_image_data['format'] ?? '' ] ?? '';
196	262
197		- $full_image_data = $data['full'] ?? array();
198		-
199	263	if ( ! empty( $full_image_data ) ) {
200		-
201	264	ob_start();
202		-
203	265	?>
204	266	<div>
205		- <strong><?php esc_html_e( 'Original Image: ', QUICKWEBP_TEXT_DOMAIN ); ?></strong>
	267	+ <strong><?php esc_html_e( 'Original Image: ', 'quickwebp' ); ?></strong>
206	268	<span><?php echo esc_html( round( $full_image_data['original_size'] / 1024, 2 ) . 'KB' ); ?></span>
207	269	</div>
208	270	<div>
209		- <strong><?php esc_html_e( 'Webp: ', QUICKWEBP_TEXT_DOMAIN ); ?></strong>
	271	+ <strong><?php echo esc_html( $format ); ?>: </strong>
210	272	<span><?php echo esc_html( round( $full_image_data['optimized_size'] / 1024, 2 ) . 'KB' ); ?></span>
211	273	</div>
212	274	<div>
213		- <strong><?php esc_html_e( 'Save: ', QUICKWEBP_TEXT_DOMAIN ); ?></strong>
	275	+ <strong><?php esc_html_e( 'Save: ', 'quickwebp' ); ?></strong>
214	276	<span><?php echo esc_html( $full_image_data['percent'] . '%' ); ?></span>
215	277	</div>
216	278	<div>
217	279	<button class="button button-sacondary quickwebp-undo-single-optimization-btn" data-attachment-id="<?php echo esc_attr( $attachment_id ); ?>">
218		- <?php esc_html_e( 'Undo optimization', QUICKWEBP_TEXT_DOMAIN ); ?>
	280	+ <?php esc_html_e( 'Undo optimization', 'quickwebp' ); ?>
219	281	<div class="spinner"></div>
220	282	</button>
221	283	<div class="quickwebp-undo-single-optimization-msg"></div>
222	284	</div>
		@@ -223,9 +285,8 @@
223	285	<?php
224	286
225	287	return ob_get_clean();
226	288	}
227		-
228	289	}
229	290
230	291	/**
231	292	* Display optimize button in the media uploader
		@@ -230,14 +291,12 @@
230	291	/**
231	292	* Display optimize button in the media uploader
232	293	*/
233	294	public function optimize_btn( $attachment_id ) {
234		-
235	295	ob_start();
236		-
237	296	?>
238	297	<button class="button button-sacondary quickwebp-single-optimization-btn" data-attachment-id="<?php echo esc_attr( $attachment_id ); ?>">
239		- <?php esc_html_e( 'Optimize', QUICKWEBP_TEXT_DOMAIN ); ?>
	298	+ <?php esc_html_e( 'Optimize', 'quickwebp' ); ?>
240	299	<div class="spinner"></div>
241	300	</button>
242	301	<div class="quickwebp-single-optimization-msg"></div>
243	302	<?php
		@@ -247,17 +306,12 @@
247	306
248	307	/**
249	308	* Check the mimetype of the file
250	309	*/
251		- public function valid_mimetype( $post_id ) {
	310	+ private function valid_mimetype( $post_id ) {
	311	+ $image_optimizer = new Quickwebp_Image_Optimizer( $this->plugin_name, $this->version );
	312	+ $allowed_mime_types = $image_optimizer->allowed_mime_types;
	313	+ $post_mime_type = get_post_mime_type( $post_id );
252	314
253		- // check the mime type
254		- $image_optimizer = new Quickwebp_Image_Optimizer( $this->plugin_name, $this->version );
255		- $mime_types = $image_optimizer->allowed_mime_types;
256		- $index = array_search( 'image/webp', $mime_types );
257		- unset( $mime_types[$index] );
258		- $mime_type = get_post_mime_type( $post_id );
259		-
260		- return in_array( $mime_type, $mime_types );
	315	+ return in_array( $post_mime_type, $allowed_mime_types );
261	316	}
262		-
263		-}
	317	+}