From 4a80c7875f8550712042329849ea57ae1967d3fc Mon Sep 17 00:00:00 2001
From: satish <satish.dvnk@vtiger.com>
Date: Mon, 27 Mar 2017 15:21:53 +0530
Subject: [PATCH] Unable to send company logo in emails
---
modules/Emails/models/Record.php | 6 +++--
packages/vtiger/optional/EmailTemplates.zip | Bin 73033 -> 73016 bytes
.../modules/EmailTemplates/models/Module.php | 22 +++++++++---------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/modules/Emails/models/Record.php b/modules/Emails/models/Record.php
index a4da3a8d4..000502348 100644
--- a/modules/Emails/models/Record.php
+++ b/modules/Emails/models/Record.php
@@ -123,7 +123,7 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
if (strpos($description, '$logo$')) {
- $description = str_replace('$logo$',"<img src='cid:logo' />", $description);
+ $description = str_replace('$logo$',"<img src='cid:companyLogo' />", $description);
$logo = true;
}
@@ -161,8 +161,10 @@ class Emails_Record_Model extends Vtiger_Record_Model {
}
}
if ($logo) {
+ $companyDetails = Vtiger_CompanyDetails_Model::getInstanceById();
+ $companyLogoDetails = $companyDetails->getLogo();
//While sending email template and which has '$logo$' then it should replace with company logo
- $mailer->AddEmbeddedImage(dirname(__FILE__).'/../../../layouts/v7/skins/images/logo_mail.jpg', 'logo', 'logo.jpg', 'base64', 'image/jpg');
+ $mailer->AddEmbeddedImage($companyLogoDetails->get('imagepath'), 'companyLogo', 'attachment', 'base64', 'image/jpg');
}
$ccs = array_filter(explode(',',$this->get('ccmail')));
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index ca8d54b0e7006ebcc13d712a1ff5b4ac00b7a88a..7067bee08933e07fc57493687e2390933deb1422 100644
GIT binary patch
delta 4149
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
delta 4148
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
diff --git a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php
index 672e3d1d7..6e3e1dd3c 100644
--- a/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php
+++ b/pkg/vtiger/modules/EmailTemplates/modules/EmailTemplates/models/Module.php
@@ -46,7 +46,7 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model {
if($systemtemplate) {
$sql = "UPDATE vtiger_emailtemplates SET templatename=?, description=?, module=?, body=?, deleted=?, systemtemplate=? WHERE templateid = ?";
} else {
- $sql = "UPDATE vtiger_emailtemplates SET templatename=?, subject=?, description=?, module=?, body=?, deleted=?, systemtemplate=? WHERE templateid = ?";
+ $sql = "UPDATE vtiger_emailtemplates SET templatename=?, subject=?, description=?, module=?, body=?, deleted=?, systemtemplate=? WHERE templateid = ?";
}
}
if(!empty($recordId) && $systemtemplate) {
@@ -138,11 +138,11 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model {
$logoPath = $site_URL . '/' . $companyModuleModel->getLogoPath();
foreach ($basicFields as $columnName => $value) {
//For column logo we need place logo in content
- if($columnName == 'logo'){
- $allFields[] = array($moduleName.':'. vtranslate($columnName, $qualifiedModule),"<img src='".$logoPath."'>");
- } else {
- $allFields[] = array($moduleName.':'. vtranslate($columnName, $qualifiedModule),"$".strtolower("companydetails")."-".$columnName."$");
- }
+ if($columnName == 'logo'){
+ $allFields[] = array($moduleName.':'. vtranslate($columnName, $qualifiedModule),"$$columnName$");
+ } else {
+ $allFields[] = array($moduleName.':'. vtranslate($columnName, $qualifiedModule),"$".strtolower("companydetails")."-".$columnName."$");
+ }
}
// Social links will be having hyperlink redirected to URL mentioned
foreach($socialFields as $columnName => $value){
@@ -188,8 +188,8 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model {
$moduleFields = $meta->getModuleFields();
$db = PearDatabase::getInstance();
//adding record id merge tag option
- $fieldInfo = array('columnname' => 'id','fieldname' => 'id','fieldlabel' =>vtranslate('LBL_RECORD_ID', $this->getName()));
- $recordIdField = WebserviceField::fromArray($db, $fieldInfo);
+ $fieldInfo = array('columnname' => 'id','fieldname' => 'id','fieldlabel' =>vtranslate('LBL_RECORD_ID', $this->getName()));
+ $recordIdField = WebserviceField::fromArray($db, $fieldInfo);
$moduleFields[$recordIdField->getFieldName()] = $recordIdField;
$returnData = array();
@@ -233,7 +233,7 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model {
continue;
}
if($relModule == 'Users') {
- if(in_array($relModuleField->getFieldDataType(),array('string','phone','email','text'))) {
+ if(in_array($relModuleField->getFieldDataType(),array('string','phone','email','text'))) {
$skipFields = array(98,115,116,31,32);
if(!in_array($relModuleField->getUIType(), $skipFields) && $relModuleField->getFieldName() != 'asterisk_extension'){
$relModuleFieldList[] = array('module' => $relModule, 'fieldname' => $relModuleField->getFieldName(), 'columnname' => $relModuleField->getColumnName(), 'fieldlabel' => $relModuleField->getFieldLabelKey());
@@ -254,8 +254,8 @@ class EmailTemplates_Module_Model extends Vtiger_Module_Model {
$db = PearDatabase::getInstance();
// Get modules names only those are active
$query = 'SELECT DISTINCT(name) AS modulename FROM vtiger_tab
- LEFT JOIN vtiger_field ON vtiger_field.tabid = vtiger_tab.tabid
- WHERE (vtiger_field.uitype = ? AND vtiger_tab.presence = ?) ';
+ LEFT JOIN vtiger_field ON vtiger_field.tabid = vtiger_tab.tabid
+ WHERE (vtiger_field.uitype = ? AND vtiger_tab.presence = ?) ';
$params = array('13',0);
// Check whether calendar module is active or not.
if(vtlib_isModuleActive("Calendar")){
--
GitLab