diff --git a/data/CRMEntity.php b/data/CRMEntity.php index f81a41c2d2bafe595575d3449d3a7972ac792c7f..0c4dd4800c560ae852dae41d281d082684758713 100644 --- a/data/CRMEntity.php +++ b/data/CRMEntity.php @@ -193,6 +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 51b35ba0e2341e08956629c2ba7d40b93f9fb4ba..4aec8b490f83f6374049984d33be24378cbee515 100644 --- a/include/utils/VtlibUtils.php +++ b/include/utils/VtlibUtils.php @@ -826,5 +826,4 @@ function vtlib_addSettingsLink($linkName, $linkURL, $blockName = false) { } return $success; } - ?> \ No newline at end of file diff --git a/languages/en_us/Contacts.php b/languages/en_us/Contacts.php index e012a599356d7aae6ce54e09082ce58ad9fd1000..e7a4b3824516e76723c11e31383851bd816f3a1f 100644 --- a/languages/en_us/Contacts.php +++ b/languages/en_us/Contacts.php @@ -9,11 +9,6 @@ *************************************************************************************/ $languageStrings = array( // Basic Strings - 'Assistant' => 'Assistant', - 'Assistant Phone' => 'Assistant Phone', - 'Birthdate' => 'Date of Birth', - 'Contact Id' => 'Contact Id', - 'Contact Image' => 'Contact Image', 'Contacts' => 'Contacts', 'SINGLE_Contacts' => 'Contact', 'LBL_ADD_RECORD' => 'Add Contact', diff --git a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php index 05901a11ec3287cb9c5fec88436aca099aaaeb7d..d23d795fb3a890a2770856a2ea1b2a8b587d2250 100644 --- a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php +++ b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php @@ -49,12 +49,13 @@ class Settings_Vtiger_CompanyDetailsSave_Action extends Settings_Vtiger_Basic_Ac $saveLogo = false; } - //mime type check - $mimeType = vtlib_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; - } + //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) {