From 272c5779da6c86ff9ce923cff68e57789acef46f Mon Sep 17 00:00:00 2001
From: Uma <uma.s@vtiger.com>
Date: Wed, 11 Nov 2015 09:39:35 +0000
Subject: [PATCH] Merged with master branch
---
data/CRMEntity.php | 31 +++++++++++--------------------
1 file changed, 11 insertions(+), 20 deletions(-)
mode change 100755 => 100644 data/CRMEntity.php
diff --git a/data/CRMEntity.php b/data/CRMEntity.php
old mode 100755
new mode 100644
index dc367763c..045c34006
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -173,26 +173,17 @@ class CRMEntity {
} else {
$file_name = $file_details['name'];
}
-
- // Check 1
- $save_file = 'true';
- //only images are allowed for Image Attachmenttype
- $mimeType = vtlib_mime_content_type($file_details['tmp_name']);
- $mimeTypeContents = explode('/', $mimeType);
- // For contacts and products we are sending attachmentType as value
- if ($attachmentType == 'Image' || ($file_details['size'] && $mimeTypeContents[0] == 'image')) {
- $save_file = validateImageFile($file_details);
- }
- if ($save_file == 'false') {
- return false;
- }
-
- // Check 2
- $save_file = 'true';
- //only images are allowed for these modules
- if ($module == 'Contacts' || $module == 'Products') {
- $save_file = validateImageFile($file_details);
- }
+ $save_file = 'true';
+ //only images are allowed for Image Attachmenttype
+ $mimeType = vtlib_mime_content_type($file_details['tmp_name']);
+ $mimeTypeContents = explode('/', $mimeType);
+ // For contacts and products we are sending attachmentType as value
+ if ($attachmentType == 'Image' || ($file_details['size'] && $mimeTypeContents[0] == 'image')) {
+ $save_file = validateImageFile($file_details);
+ }
+ if ($save_file == 'false') {
+ return false;
+ }
$binFile = sanitizeUploadFileName($file_name, $upload_badext);
--
GitLab