Skip to content

v2.1.7 #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
teamcrombie merged 6 commits into from
Jan 15, 2025
Merged

v2.1.7 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e39b36c
In the file preview in grid mode, the restore button now works correc…
Jan 15, 2025
48c2e65
When auto-compressing or auto-watermarking a file that was being uplo…
Jan 15, 2025
5190520
When auto-compressing or auto-watermarking a file that was being uplo…
Jan 15, 2025
9f77b28
The error message in authentication has been improved.
Jan 15, 2025
15ef770
update plugin to v2.1.7
Jan 15, 2025
8cf99dd
Merge pull request #42 from ilovepdf/feature/v2.1.7
teamcrombie Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
=== PDF Compressor & Watermark - iLovePDF ===
Plugin Name: Image Compressor & Optimizer - iLovePDF
Version: 2.1.6
Version: 2.1.7
Author: iLovePDF
Author URI: https://www.ilovepdf.com/
Contributors: iLovePDF
Tags: compress, watermark, optimize, performance, pdf optimizer
Requires at least: 5.3
Tested up to: 6.7
Stable tag: 2.1.6
Stable tag: 2.1.7
Requires PHP: 7.4
License: GPLv2 or later
License URI: https://www.gnu.org/licenses/gpl-2.0.html
Expand Down Expand Up @@ -81,6 +81,15 @@ We will send you an email before limit is reached. When limit is reached, no mor

== Changelog ==

= 2.1.7 =
Fixed
* In the file preview in grid mode, the restore button now works correctly.
* When auto-compressing or auto-watermarking a file that was being uploaded, an error message was incorrectly displayed.

Improved
* The regeneration of subimages has been improved.
* The error message for authentication in the watermark function has been improved.

= 2.1.6 =
Improved
* Update Libraries.
Expand Down
79 changes: 41 additions & 38 deletions admin/functions-compress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ function ilove_pdf_compress_pdf( $id_file, $auto = false, $bulk = false ) {
*
* @since 1.0.0
* @param int $attachment_id File ID.
* @throws \Exception Returns an error in case the compression process fails.
*/
function ilove_pdf_handle_file_upload_compress( $attachment_id ) {
if ( get_post_mime_type( $attachment_id ) === 'application/pdf' ) {
Expand All @@ -193,45 +194,47 @@ function ilove_pdf_handle_file_upload_compress( $attachment_id ) {

if ( isset( $options['ilove_pdf_compress_autocompress_new'] ) && ! ilove_pdf_is_file_compressed( $attachment_id ) && ! isset( $options_watermark['ilove_pdf_watermark_auto'] ) ) {

$html = ilove_pdf_compress_pdf( $attachment_id, true );

if ( ! ilove_pdf_is_file_watermarked( $attachment_id ) && get_user_option( 'media_library_mode', get_current_user_id() ) === 'list' && ! wp_doing_ajax() ) {

echo '<img class="pinkynail" src="' . esc_url( includes_url() ) . '/images/media/document.png" alt="">';
echo '<span class="title custom-title">' . esc_html( get_the_title( $attachment_id ) ) . '</span><span class="pdf-id">ID: ';

?><script type='text/javascript' id="my-script-<?php echo (int) $attachment_id; ?>">
jQuery( function( $ ) {
var response = '<?php echo wp_kses_post( $html ); ?>';
var currentElem = $('#my-script-<?php echo (int) $attachment_id; ?>');
var parentTag = currentElem.parent();
var parentDiv = parentTag.parent();
parentDiv.find('.progress').find('.percent').html('Compressing...');
window.setTimeout(function(){
if (response !== '1') {
parentDiv.find('.progress').find('.percent').html(response.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
parentDiv.find('.progress').find('.bar').css({'background-color':'#46b450'});
parentDiv.find('.progress').find('.percent').html('Compressed!');
}
},3000);
});

</script>
<?php
} elseif ( ! ilove_pdf_is_file_watermarked( $attachment_id ) && ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'grid' || wp_doing_ajax() ) ) {
if ( '1' !== $html ) {
$return = array( 'message' => wp_strip_all_tags( $html ) );
wp_send_json_error( $return );
} else {
$attachment = wp_prepare_attachment_for_js( $attachment_id );
$attachment['message'] = 'PDF Compressed!';
wp_send_json_success( $attachment );
try {
$html = ilove_pdf_compress_pdf( $attachment_id, true );

if ( ! ilove_pdf_is_file_watermarked( $attachment_id ) && get_user_option( 'media_library_mode', get_current_user_id() ) === 'list' && ! wp_doing_ajax() ) {

echo '<img class="pinkynail" src="' . esc_url( includes_url() ) . '/images/media/document.png" alt="">';
echo '<span class="title custom-title">' . esc_html( get_the_title( $attachment_id ) ) . '</span><span class="pdf-id">ID: ';

?><script type='text/javascript' id="my-script-<?php echo (int) $attachment_id; ?>">
jQuery( function( $ ) {
var response = '<?php echo wp_kses_post( $html ); ?>';
var currentElem = $('#my-script-<?php echo (int) $attachment_id; ?>');
var parentTag = currentElem.parent();
var parentDiv = parentTag.parent();
parentDiv.find('.progress').find('.percent').html('Compressing...');
window.setTimeout(function(){
if (response !== '1') {
parentDiv.find('.progress').find('.percent').html(response.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
parentDiv.find('.progress').find('.bar').css({'background-color':'#46b450'});
parentDiv.find('.progress').find('.percent').html('Compressed!');
}
},3000);
});

</script>
<?php
if ( ! is_bool( $html ) ) {
throw new Exception( 'Exception on media upload mode list: ' . print_r( wp_strip_all_tags( $html ), true ) ); // phpcs:ignore
}
} elseif ( ! ilove_pdf_is_file_watermarked( $attachment_id ) && ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'grid' || wp_doing_ajax() ) ) {
if ( ! is_bool( $html ) ) {
throw new Exception( 'Exception on media upload mode grid: ' . print_r( wp_strip_all_tags( $html ), true ) ); // phpcs:ignore
}
}
}
} catch ( \Exception $e ) {
error_log('Exception on ilove_pdf_handle_file_upload_compress Method: ' . print_r(array('message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()), true)); // phpcs:ignore
}
}
}
}
Expand Down
130 changes: 69 additions & 61 deletions admin/functions-processed-files.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,11 @@ function ilove_pdf_upload_compress_file( $filename, $attachment_id ) {
* Upload Watermark File.
*
* @since 1.0.0
* @param string $filename File Name.
* @param int $attachment_id File ID.
* @param string $filename File Name.
* @param int $attachment_id File ID.
* @param boolean $generate_manual_attachment_thubnails Allows you to generate the images for the file again.
*/
function ilove_pdf_upload_watermark_file( $filename, $attachment_id ) {
function ilove_pdf_upload_watermark_file( $filename, $attachment_id, $generate_manual_attachment_thubnails = true ) {
$wp_upload_dir = wp_upload_dir();
if ( ! ilove_pdf_is_file_compressed( $attachment_id ) ) {
$original_file_size = filesize( get_attached_file( $attachment_id ) );
Expand All @@ -96,7 +97,9 @@ function ilove_pdf_upload_watermark_file( $filename, $attachment_id ) {
copy( $wp_upload_dir['basedir'] . '/pdf/watermark/' . basename( get_attached_file( $attachment_id ) ), get_attached_file( $attachment_id ) );

// Regenerate attachment metadata
ilove_pdf_regenerate_attachment_data( $attachment_id );
if ( $generate_manual_attachment_thubnails ) {
ilove_pdf_regenerate_attachment_data( $attachment_id );
}

if ( get_option( 'ilovepdf_watermarked_files' ) || get_option( 'ilovepdf_watermarked_files' ) === '0' ) {
$n_watermarked_files = intval( get_option( 'ilovepdf_watermarked_files' ) ) + 1;
Expand Down Expand Up @@ -206,6 +209,7 @@ function ilove_pdf_handle_delete_file( $attachment_id ) {
*
* @since 1.0.0
* @param int $attachment_id File ID.
* @throws \Exception Returns an error in case the compressing or wartermarking process fails.
*/
function ilove_pdf_handle_file_upload_compress_watermark( $attachment_id ) {
if ( get_post_mime_type( $attachment_id ) === 'application/pdf' ) {
Expand All @@ -214,66 +218,70 @@ function ilove_pdf_handle_file_upload_compress_watermark( $attachment_id ) {
Ilove_Pdf::update_option( 'ilovepdf_initial_pdf_files_size', get_option( 'ilovepdf_initial_pdf_files_size' ) + filesize( get_attached_file( $attachment_id ) ) );

if ( isset( $options_compress['ilove_pdf_compress_autocompress_new'] ) && isset( $options_watermark['ilove_pdf_watermark_auto'] ) ) {
$html_compress = ilove_pdf_compress_pdf( $attachment_id, true );
$html_watermark = ilove_pdf_watermark_pdf( $attachment_id, true );

if ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'list' && ! wp_doing_ajax() ) {

echo '<img class="pinkynail" src="' . esc_url( includes_url() ) . '/images/media/document.png" alt="">';
echo '<span class="title custom-title">' . esc_html( get_the_title( $attachment_id ) ) . '</span><span class="pdf-id">ID: ';

?><script type='text/javascript' id="my-script-<?php echo (int) $attachment_id; ?>">
jQuery( function( $ ) {
var response_compress = '<?php echo wp_kses_post( $html_compress ); ?>';
var currentElem = $('#my-script-<?php echo (int) $attachment_id; ?>');
var parentTag = currentElem.parent();
var parentDiv = parentTag.parent();
parentDiv.find('.progress').find('.percent').html('Compressing...');
window.setTimeout(function(){
if (response_compress !== '1') {
parentDiv.find('.progress').find('.percent').html(response_compress.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
var response_watermark = '<?php echo wp_kses_post( $html_watermark ); ?>';
parentDiv.find('.progress').find('.percent').html('Applying Watermark...');
window.setTimeout(function(){
if (response_watermark !== '1') {
parentDiv.find('.progress').find('.percent').html(response_watermark.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
parentDiv.find('.progress').css('width','250px');
parentDiv.find('.progress').find('.percent').css('width','250px');
parentDiv.find('.progress').find('.bar').css({'width':'250px','background-color':'#46b450'});
parentDiv.find('.progress').find('.percent').html('Compressed and Stamped!');
}
},3000);
}
},3000);
});

</script>
<?php
} elseif ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'grid' || wp_doing_ajax() ) {
if ( '1' !== $html_compress || '1' !== $html_watermark ) {
if ( '1' !== $html_compress ) {
$return = array( 'message' => wp_strip_all_tags( $html_compress ) );
}

if ( '1' !== $html_watermark ) {
$return = array( 'message' => wp_strip_all_tags( $html_watermark ) );
try {
$html_compress = ilove_pdf_compress_pdf( $attachment_id, true );
$html_watermark = ilove_pdf_watermark_pdf( $attachment_id, true, false, false );

if ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'list' && ! wp_doing_ajax() ) {

echo '<img class="pinkynail" src="' . esc_url( includes_url() ) . '/images/media/document.png" alt="">';
echo '<span class="title custom-title">' . esc_html( get_the_title( $attachment_id ) ) . '</span><span class="pdf-id">ID: ';

?><script type='text/javascript' id="my-script-<?php echo (int) $attachment_id; ?>">
jQuery( function( $ ) {
var response_compress = '<?php echo wp_kses_post( $html_compress ); ?>';
var currentElem = $('#my-script-<?php echo (int) $attachment_id; ?>');
var parentTag = currentElem.parent();
var parentDiv = parentTag.parent();
parentDiv.find('.progress').find('.percent').html('Compressing...');
window.setTimeout(function(){
if (response_compress !== '1') {
parentDiv.find('.progress').find('.percent').html(response_compress.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
var response_watermark = '<?php echo wp_kses_post( $html_watermark ); ?>';
parentDiv.find('.progress').find('.percent').html('Applying Watermark...');
window.setTimeout(function(){
if (response_watermark !== '1') {
parentDiv.find('.progress').find('.percent').html(response_watermark.replace(/<\/?p[^>]*>/g, "").replace(/<\/?div[^>]*>/g, ""));
parentDiv.find('.progress').css('width','600px');
parentDiv.find('.progress').find('.percent').css('width','600px');
parentDiv.find('.progress').find('.bar').css({'width':'600px','background-color':'#a00'});
} else {
parentDiv.find('.progress').css('width','250px');
parentDiv.find('.progress').find('.percent').css('width','250px');
parentDiv.find('.progress').find('.bar').css({'width':'250px','background-color':'#46b450'});
parentDiv.find('.progress').find('.percent').html('Compressed and Stamped!');
}
},3000);
}
},3000);
});

</script>
<?php
if ( ! is_bool( $html_compress ) ) {
throw new Exception( 'Exception on media upload mode list, compress: ' . print_r( wp_strip_all_tags( $html_compress ), true ) ); // phpcs:ignore
}

wp_send_json_error( $return );
} else {
$attachment = wp_prepare_attachment_for_js( $attachment_id );
$attachment['message'] = 'PDF Compressed & Stamped!';
wp_send_json_success( $attachment );
}
}
if ( ! is_bool( $html_watermark ) ) {
throw new Exception( 'Exception on media upload mode list, watermark: ' . print_r( wp_strip_all_tags( $html_watermark ), true ) ); // phpcs:ignore
}
} elseif ( get_user_option( 'media_library_mode', get_current_user_id() ) === 'grid' || wp_doing_ajax() ) {
if ( ! is_bool( $html_compress ) ) {
throw new Exception( 'Exception on media upload mode grid, compress: ' . print_r( wp_strip_all_tags( $html_compress ), true ) ); // phpcs:ignore
}

if ( ! is_bool( $html_watermark ) ) {
throw new Exception( 'Exception on media upload mode grid, watermark: ' . print_r( wp_strip_all_tags( $html_watermark ), true ) ); // phpcs:ignore
}
}
} catch ( \Exception $e ) {
error_log('Exception on ilove_pdf_handle_file_upload_compress_watermark Method: ' . print_r(array('message' => $e->getMessage(), 'file' => $e->getFile(), 'line' => $e->getLine()), true)); // phpcs:ignore
}
}
}
}
Expand Down
Loading