diff --git a/languages/en_gb/Calendar.php b/languages/en_gb/Calendar.php
index f15875aaef06039689091c3eeba78858ec386d37..ed731fbceff2789b95d9c2a7cd0fc9c1010883a4 100644
--- a/languages/en_gb/Calendar.php
+++ b/languages/en_gb/Calendar.php
@@ -26,7 +26,7 @@ $languageStrings = array(
'LBL_EVENT_INFORMATION' => 'Event Details' ,
'Subject' => 'Subject' ,
'Start Date & Time' => 'Start Date & Time' ,
- 'Activity Type' => 'Activity Type' ,
+ 'Activity Type' => 'Event Type' ,
'Send Notification' => 'Send Notification' ,
'Location' => 'Location' ,
'End Date & Time' => 'End Date & Time' ,
diff --git a/languages/en_gb/Events.php b/languages/en_gb/Events.php
index 5e59aff5550c66d051853fa7b3e880d4d3b2988c..c59bdcdc77f31d4dd233c44344031baefeebf552 100644
--- a/languages/en_gb/Events.php
+++ b/languages/en_gb/Events.php
@@ -25,7 +25,7 @@ $languageStrings = array(
'Location' => 'Location' ,
'Send Reminder' => 'Send Email Reminder Before' ,
'End Date & Time' => 'End Date & Time' ,
- 'Activity Type' => 'Activity Type' ,
+ 'Activity Type' => 'Event Type' ,
'Visibility' => 'Visibility' ,
'Private' => 'Private' ,
'Public' => 'Public' ,
diff --git a/languages/en_us/Calendar.php b/languages/en_us/Calendar.php
index 6ab769b6e1f4b0768fb4233ec62dfd6039bc35a6..d01ddc5204a9da9a4dbdb6c133a7fe018c416a6b 100644
--- a/languages/en_us/Calendar.php
+++ b/languages/en_us/Calendar.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
* *********************************************************************************** */
$languageStrings = array(
- 'Activity Type' => 'Activity Type',
+ 'Activity Type' => 'Event Type', /* Event field */
'Call' => 'Call',
'Completed' => 'Completed',
'Daily' => 'Day(s)',
diff --git a/languages/en_us/Events.php b/languages/en_us/Events.php
index 78d843f9933bf8450e706af8fe69748ab39f9c45..67286bec6b54ca6f47873d51d350c993eaefe6e7 100644
--- a/languages/en_us/Events.php
+++ b/languages/en_us/Events.php
@@ -11,7 +11,7 @@
/* NOTE: Should be inline with Calendar language translation but few variations */
$languageStrings = array(
- 'Activity Type'=>'Activity Type',
+ 'Activity Type'=>'Event Type', /* Events Field */
'Busy' => 'Busy',
'Call' => 'Call',
'Daily'=>'Day(s)',
diff --git a/layouts/vlayout/modules/Vtiger/RecentActivities.tpl b/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
index dcdc7041a461ea325a81e85ace87de22d99c8a6d..5b6bfb1d4a8a99de28982f668a6a755df400ff46 100644
--- a/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
+++ b/layouts/vlayout/modules/Vtiger/RecentActivities.tpl
@@ -45,14 +45,14 @@
<div class='font-x-small updateInfoContainer'>
<i>{vtranslate($FIELDMODEL->getName(),$MODULE_NAME)}</i> :
{if $FIELDMODEL->get('prevalue') neq '' && $FIELDMODEL->get('postvalue') neq '' && !($FIELDMODEL->getFieldInstance()->getFieldDataType() eq 'reference' && ($FIELDMODEL->get('postvalue') eq '0' || $FIELDMODEL->get('prevalue') eq '0'))}
- {vtranslate('LBL_FROM')} <b style="white-space:pre;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue'))))}</b>
+ {vtranslate('LBL_FROM')} <b style="white-space:pre-wrap;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue'))))}</b>
{else if $FIELDMODEL->get('postvalue') eq '' || ($FIELDMODEL->getFieldInstance()->getFieldDataType() eq 'reference' && $FIELDMODEL->get('postvalue') eq '0')}
<b> {vtranslate('LBL_DELETED')} </b> ( <del>{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue'))))}</del> )
{else}
{vtranslate('LBL_CHANGED')}
{/if}
{if $FIELDMODEL->get('postvalue') neq '' && !($FIELDMODEL->getFieldInstance()->getFieldDataType() eq 'reference' && $FIELDMODEL->get('postvalue') eq '0')}
- {vtranslate('LBL_TO')} <b style="white-space:pre;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue'))))}</b>
+ {vtranslate('LBL_TO')} <b style="white-space:pre-wrap;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue'))))}</b>
{/if}
</div>
diff --git a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
index 883c1abc1c1d1ee66ff0418ff9e7a574ac330332..4c2fc470ea9e55e61c6f65f5e73d1c8f23b8acb7 100644
--- a/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
+++ b/modules/Settings/Vtiger/actions/CompanyDetailsSave.php
@@ -17,32 +17,17 @@ class Settings_Vtiger_CompanyDetailsSave_Action extends Settings_Vtiger_Basic_Ac
$status = false;
if ($request->get('organizationname')) {
- $saveLogo = $status = true;
+ $saveLogo = $status = true;
+ $binFileName = false;
if(!empty($_FILES['logo']['name'])) {
$logoDetails = $_FILES['logo'];
- $fileType = explode('/', $logoDetails['type']);
- $fileType = $fileType[1];
+ $saveLogo = Vtiger_Functions::validateImage($logoDetails);
+ if (is_string($saveLogo)) $saveLogo = ($saveLogo == 'false')? false : true;
- if (!$logoDetails['size'] || !in_array($fileType, Settings_Vtiger_CompanyDetails_Model::$logoSupportedFormats)) {
- $saveLogo = false;
- }
-
- if ($saveLogo) {
- //mime type check
- $mimeType = mime_content_type($logoDetails['tmp_name']);
- $mimeTypeContents = explode('/', $mimeType);
- if ($mimeTypeContents[0] != 'image' || !in_array($mimeTypeContents[1], Settings_Vtiger_CompanyDetails_Model::$logoSupportedFormats)) {
- $saveLogo = false;
- }
- }
-
- if ($saveLogo) {
- $saveLogo = Vtiger_Functions::validateImage($logoDetails);
- if (is_string($saveLogo)) $saveLogo = ($saveLogo == 'false')? false : true;
- }
-
- if ($saveLogo) {
- $moduleModel->saveLogo();
+ global $upload_badext;
+ $binFileName = sanitizeUploadFileName($logoDetails['name'], $upload_badext);
+ if ($saveLogo) {
+ $moduleModel->saveLogo($binFileName);
}
}else{
$saveLogo = true;
@@ -51,8 +36,8 @@ class Settings_Vtiger_CompanyDetailsSave_Action extends Settings_Vtiger_Basic_Ac
foreach ($fields as $fieldName => $fieldType) {
$fieldValue = $request->get($fieldName);
if ($fieldName === 'logoname') {
- if (!empty($logoDetails['name'])) {
- $fieldValue = ltrim(basename(" " . $logoDetails['name']));
+ if (!empty($logoDetails['name']) && $binFileName) {
+ $fieldValue = ltrim(basename(" " . $binFileName));
} else {
$fieldValue = $moduleModel->get($fieldName);
}
diff --git a/modules/Settings/Vtiger/models/CompanyDetails.php b/modules/Settings/Vtiger/models/CompanyDetails.php
index c4073af843af3bcc86e13c331857fbbf59cde6b6..84f4514a2430f3c3f31a17dc5c0b98912630bcae 100644
--- a/modules/Settings/Vtiger/models/CompanyDetails.php
+++ b/modules/Settings/Vtiger/models/CompanyDetails.php
@@ -89,11 +89,13 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
/**
* Function to save the logoinfo
*/
- public function saveLogo() {
- $uploadDir = vglobal('root_directory'). '/' .$this->logoPath;
- $logoName = $uploadDir.$_FILES["logo"]["name"];
- move_uploaded_file($_FILES["logo"]["tmp_name"], $logoName);
- copy($logoName, $uploadDir.'application.ico');
+ public function saveLogo($binFileName) {
+ if ($binFileName) {
+ $uploadDir = vglobal('root_directory'). '/' .$this->logoPath;
+ $logoName = $uploadDir.$binFileName;
+ move_uploaded_file($_FILES["logo"]["tmp_name"], $logoName);
+ copy($logoName, $uploadDir.'application.ico');
+ }
}
/**
@@ -165,4 +167,4 @@ class Settings_Vtiger_CompanyDetails_Model extends Settings_Vtiger_Module_Model
}
return self::$settings[$fieldname];
}
-}
\ No newline at end of file
+}