From abd71d48055a95f7f53ce880d5b37ca5de5db144 Mon Sep 17 00:00:00 2001
From: Uma S <uma.s@vtiger.com>
Date: Thu, 18 Jul 2019 17:47:53 +0530
Subject: [PATCH] Merge with master
---
data/CRMEntity.php | 2 +-
include/utils/VtlibUtils.php | 1 +
modules/Settings/Vtiger/actions/CompanyDetailsSave.php | 9 +--------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 0c4dd4800..dc367763c 100644
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -193,7 +193,7 @@ class CRMEntity {
if ($module == 'Contacts' || $module == 'Products') {
$save_file = validateImageFile($file_details);
}
-
+
$binFile = sanitizeUploadFileName($file_name, $upload_badext);
$current_id = $adb->getUniqueID("vtiger_crmentity");
diff --git a/include/utils/VtlibUtils.php b/include/utils/VtlibUtils.php
index 4aec8b490..51b35ba0e 100644
--- a/include/utils/VtlibUtils.php
+++ b/include/utils/VtlibUtils.php
@@ -826,4 +826,5 @@ function vtlib_addSettingsLink($linkName, $linkURL, $blockName = false) {
}
return $success;
}
+
?>
\ No newline at end of file
diff --git a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
index d23d795fb..6c644da59 100644
--- a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
+++ b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
@@ -49,13 +49,6 @@ class Settings_Vtiger_CompanyDetailsSave_Action extends Settings_Vtiger_Basic_Ac
$saveLogo = false;
}
- //mime type check
- $mimeType = mime_content_type($logoDetails['tmp_name']);
- $mimeTypeContents = explode('/', $mimeType);
- if (!$logoDetails['size'] || $mimeTypeContents[0] != 'image' || !in_array($mimeTypeContents[1], Settings_Vtiger_CompanyDetails_Model::$logoSupportedFormats)) {
- $saveLogo = false;
- }
-
// Check for php code injection
$imageContents = file_get_contents($logoDetails["tmp_name"]);
if (preg_match('/(<\?php?(.*?))/i', $imageContents) == 1) {
@@ -100,4 +93,4 @@ class Settings_Vtiger_CompanyDetailsSave_Action extends Settings_Vtiger_Basic_Ac
public function validateRequest(Vtiger_Request $request) {
$request->validateWriteAccess();
}
-}
+}
\ No newline at end of file
--
GitLab