Merge pull request opencart#13672 from stalker780/patch-12

Update download.php
mhcwebdesign · Feb 17, 2024 · 76a8fd9 · 76a8fd9
2 parents df65e86 + b37f561
commit 76a8fd9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/upload/admin/controller/catalog/download.php b/upload/admin/controller/catalog/download.php
@@ -279,7 +279,7 @@ public function save(): void {
 			}
 		}
 
-		if ((oc_strlen($this->request->post['filename']) < 3) || (oc_strlen($this->request->post['filename']) > 128)) {
+		if (!oc_validate_length($this->request->post['filename'], 3, 128)) {
 			$json['error']['filename'] = $this->language->get('error_filename');
 		}
 
@@ -291,15 +291,15 @@ public function save(): void {
 			$json['error']['filename'] = $this->language->get('error_exists');
 		}
 
-		if (preg_match('/[^a-zA-Z0-9\/._-]|[\p{Cyrillic}]+/u', $this->request->post['filename'])) {
+		if (!oc_validate_filename($this->request->post['filename'])) {
 			$json['error']['filename'] = $this->language->get('error_filename_character');
 		}
 
-		if ((oc_strlen($this->request->post['mask']) < 3) || (oc_strlen($this->request->post['mask']) > 128)) {
+		if (!oc_validate_length($this->request->post['mask'], 3, 128)) {
 			$json['error']['mask'] = $this->language->get('error_mask');
 		}
 
-		if (preg_match('/[^a-zA-Z0-9\/._-]|[\p{Cyrillic}]+/u', $this->request->post['mask'])) {
+		if (!oc_validate_filename($this->request->post['mask'])) {
 			$json['error']['mask'] = $this->language->get('error_mask_character');
 		}