Merged with master

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'             , 

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'                      , 

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)',

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)',

layouts/vlayout/modules/Vtiger/RecentActivities.tpl

@@ -45,14 +45,14 @@
 										<div class='font-x-small updateInfoContainer'>
 											<i>{vtranslate($FIELDMODEL->getName(),$MODULE_NAME)}</i> :&nbsp;
 												{if $FIELDMODEL->get('prevalue') neq '' && $FIELDMODEL->get('postvalue') neq '' && !($FIELDMODEL->getFieldInstance()->getFieldDataType() eq 'reference' && ($FIELDMODEL->get('postvalue') eq '0' || $FIELDMODEL->get('prevalue') eq '0'))}
-													&nbsp;{vtranslate('LBL_FROM')} <b style="white-space:pre;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue'))))}</b>
+													&nbsp;{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')}
 													&nbsp; <b> {vtranslate('LBL_DELETED')} </b> ( <del>{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('prevalue'))))}</del> )
 												{else}
 													&nbsp;{vtranslate('LBL_CHANGED')}
 												{/if}
 												{if $FIELDMODEL->get('postvalue') neq '' && !($FIELDMODEL->getFieldInstance()->getFieldDataType() eq 'reference' && $FIELDMODEL->get('postvalue') eq '0')}
-													&nbsp;{vtranslate('LBL_TO')}&nbsp;<b style="white-space:pre;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue'))))}</b>
+													&nbsp;{vtranslate('LBL_TO')}&nbsp;<b style="white-space:pre-wrap;">{Vtiger_Util_Helper::toVtiger6SafeHTML($FIELDMODEL->getDisplayValue(decode_html($FIELDMODEL->get('postvalue'))))}</b>
 												{/if}
 	
 										</div>

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);
 					}

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
+}