From ec8d7a36a8734ce420ae194ad546e03f6619a03b Mon Sep 17 00:00:00 2001 From: johnnyq Date: Tue, 18 Mar 2025 16:48:05 -0400 Subject: [PATCH] Only store optimized WebP images, so only 1 image is stored and used for thumnails and viewing, removed fields has_preview and has_thumbnail as these are no longer needed, fixed issue when optimizing portrait images the bottom half would get cropped out --- client_files.php | 40 +------- database_updates.php | 15 ++- db.sql | 2 +- includes/database_version.php | 2 +- modals/client_file_view_modal.php | 2 +- post/user/file.php | 148 +++++++++++++----------------- 6 files changed, 83 insertions(+), 126 deletions(-) diff --git a/client_files.php b/client_files.php index 549f7bcf..1232b544 100644 --- a/client_files.php +++ b/client_files.php @@ -322,22 +322,12 @@ while ($folder_id > 0) { $file_size_KB = number_format($file_size / 1024); $file_mime_type = nullable_htmlentities($row['file_mime_type']); $file_uploaded_by = nullable_htmlentities($row['user_name']); - $file_has_thumbnail = intval($row['file_has_thumbnail']); - $file_has_preview = intval($row['file_has_preview']); - $file_thumbnail_source = $file_reference_name; - if ($file_has_thumbnail == 1) { - $file_thumbnail_source = "thumbnail_$file_reference_name"; - } - $file_preview_source = $file_reference_name; - if ($file_has_preview == 1) { - $file_preview_source = "preview_$file_reference_name"; - } // Store file data into an array for JS $files[] = [ 'id' => $file_id, 'name' => $file_name, - 'preview' => "uploads/clients/$client_id/$file_preview_source" + 'preview' => "uploads/clients/$client_id/$file_reference_name" ]; ?> @@ -345,7 +335,7 @@ while ($folder_id > 0) {
- " alt=""> + " alt="">
@@ -356,18 +346,8 @@ while ($folder_id > 0) {
" download=""> - Download Original + Download - - " download="preview_"> - Download Optimized - - - - " download="thumbnail_"> - Download Thumbnail - - )"> Share @@ -493,8 +473,6 @@ while ($folder_id > 0) { $file_mime_type = nullable_htmlentities($row['file_mime_type']); $file_size = intval($row['file_size']); $file_uploaded_by = nullable_htmlentities($row['user_name']); - $file_has_thumbnail = intval($row['file_has_thumbnail']); - $file_has_preview = intval($row['file_has_preview']); $file_created_at = nullable_htmlentities($row['file_created_at']); $file_folder_id = intval($row['file_folder_id']); @@ -573,18 +551,8 @@ while ($folder_id > 0) {
" download=""> - Download Original + Download - - " download="preview_"> - Download Optimized - - - - " download="thumbnail_"> - Download Thumbnail - - )"> Share diff --git a/database_updates.php b/database_updates.php index 43dff4f4..5cef5761 100644 --- a/database_updates.php +++ b/database_updates.php @@ -3387,10 +3387,19 @@ if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.8'"); } - // if (CURRENT_DATABASE_VERSION == '2.0.8') { - // // Insert queries here required to update to DB version 2.0.9 + if (CURRENT_DATABASE_VERSION == '2.0.8') { + + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_has_thumbnail`"); + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_has_preview`"); + mysqli_query($mysqli, "ALTER TABLE `files` DROP `file_asset_id`"); + + mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.9'"); + } + + // if (CURRENT_DATABASE_VERSION == '2.0.9') { + // // Insert queries here required to update to DB version 2.1.0 // // Then, update the database to the next sequential version - // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.0.9'"); + // mysqli_query($mysqli, "UPDATE `settings` SET `config_current_database_version` = '2.1.0'"); // } } else { diff --git a/db.sql b/db.sql index 48186dbf..ca34d0a3 100644 --- a/db.sql +++ b/db.sql @@ -2494,4 +2494,4 @@ CREATE TABLE `vendors` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2025-03-17 14:58:00 +-- Dump completed on 2025-03-18 16:46:18 diff --git a/includes/database_version.php b/includes/database_version.php index 8b3d3c0d..61ff9367 100644 --- a/includes/database_version.php +++ b/includes/database_version.php @@ -5,4 +5,4 @@ * It is used in conjunction with database_updates.php */ -DEFINE("LATEST_DATABASE_VERSION", "2.0.8"); +DEFINE("LATEST_DATABASE_VERSION", "2.0.9"); diff --git a/modals/client_file_view_modal.php b/modals/client_file_view_modal.php index c4a6955e..47d99825 100644 --- a/modals/client_file_view_modal.php +++ b/modals/client_file_view_modal.php @@ -1,5 +1,5 @@