lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use language to find template email.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-10-12 21:24:51 +02:00
parent 3bac7c9e11
commit e101bfceea
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/core/class/html.formmail.class.php
View File

@ -692,22 +692,25 @@ class FormMail
{ {
$ret=array(); $ret=array();
$sql = "SELECT topic, content"; $sql = "SELECT label, topic, content, lang";
$sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates'; $sql.= " FROM ".MAIN_DB_PREFIX.'c_email_templates';
$sql.= " WHERE type_template='".$db->escape($type_template)."'"; $sql.= " WHERE type_template='".$db->escape($type_template)."'";
$sql.= " AND entity IN (".getEntity("c_email_templates").")"; $sql.= " AND entity IN (".getEntity("c_email_templates").")";
$sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")"; $sql.= " AND (fk_user is NULL or fk_user = 0 or fk_user = ".$user->id.")";
// TODO Add field and where filter on language code if (is_object($outputlangs)) $sql.= " AND (lang = '".$outputlangs->defaultlang."' OR lang IS NULL OR lang = '')";
//print $sql; $sql.= $db->order("lang,label","ASC");
print $sql;
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) if ($resql)
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql); // Get first found
if ($obj) if ($obj)
{ {
$ret['label']=$obj->label;
$ret['topic']=$obj->topic; $ret['topic']=$obj->topic;
$ret['content']=$obj->content; $ret['content']=$obj->content;
$ret['lang']=$obj->lang;
} }
else else
{ {
@ -722,8 +725,10 @@ class FormMail
elseif ($type_template=='fichinter_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); } elseif ($type_template=='fichinter_send') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentSendFichInter"); }
elseif ($type_template=='thirdparty') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); } elseif ($type_template=='thirdparty') { $defaultmessage=$outputlangs->transnoentities("PredefinedMailContentThirdparty"); }
$ret['label']='default';
$ret['topic']=''; $ret['topic']='';
$ret['content']=$defaultmessage; $ret['content']=$defaultmessage;
$ret['lang']=$outputlangs->defaultlang;
} }
$db->free($resql); $db->free($resql);