From 04b693a66a8de9d482bcf542c019090a02287acf Mon Sep 17 00:00:00 2001
From: MadD3n <support@ave-cms.ru>
Date: Tue, 18 Apr 2023 22:01:58 +0300
Subject: [PATCH] Fixed images fields

---
 admin/browser.php                          | 16 +++++++++++-----
 admin/templates/browser/browser_upload.tpl |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin/browser.php b/admin/browser.php
index 86f3b7f..2c08fdf 100644
--- a/admin/browser.php
+++ b/admin/browser.php
@@ -149,12 +149,18 @@
 
 				if (@unlink($del_file))
 				{
-					$nameParts = explode('.', $file_name);
-					$ext = strtolower(end($nameParts));
-					if (in_array($ext, $images_ext))
+					foreach (glob($upload_path . $_REQUEST['dir'] . THUMBNAIL_DIR . '/*') as $f_name)
 					{
-						$nameParts[count($nameParts)-2] .= $thumb_size;
-						@unlink($upload_path . $_REQUEST['dir'] . THUMBNAIL_DIR . '/' . implode('.', $nameParts));
+						$base_file = basename($del_file);
+						$nameParts = explode('.', $base_file);
+						$start = strtolower(array_shift($nameParts));
+						$ext = strtolower(array_pop($nameParts));
+
+						$regexp = '/^(' . $start . ')*(-)(t|f|c|s).{3,}.(' . $ext . ')/';
+
+						if (preg_match_all($regexp, basename($f_name))) {
+							@unlink($upload_path . $_REQUEST['dir'] . THUMBNAIL_DIR . '/' . basename($f_name));
+						}
 					}
 
 					reportLog($_SESSION['user_name'] . ' - удалил файл ('
diff --git a/admin/templates/browser/browser_upload.tpl b/admin/templates/browser/browser_upload.tpl
index fc65a4c..ee3ff5d 100644
--- a/admin/templates/browser/browser_upload.tpl
+++ b/admin/templates/browser/browser_upload.tpl
@@ -1,5 +1,5 @@
 <script>
-	let path_upload = "{$smarty.request.dir|escape}";
+	var path_upload = "{$smarty.request.dir|escape}";
 </script>
 
 <!-- Wrapper -->