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

New: If field "signature" is filled into user table, text is added at

Browse Source 
end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on,
this feautre is disabled.
This commit is contained in:
Laurent Destailleur 2012-08-07 16:55:14 +02:00
parent 9800b6e7a6
commit 5ddd982f6e
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ English Dolibarr ChangeLog
***** ChangeLog for 3.3 compared to 3.2 ***** ***** ChangeLog for 3.3 compared to 3.2 *****
For users: For users:
- New: If field "signature" is filled into user table, text is added
at end of predefined email texts. If option MAIL_DO_NOT_USE_SIGN is on, this
feautre is disabled.
- New: Add link "Back to list" on all cards. - New: Add link "Back to list" on all cards.
- New: After first install, warning are visible onto mandatory setup not - New: After first install, warning are visible onto mandatory setup not
configured. Show also total number of activated modules. configured. Show also total number of activated modules.

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

@ -601,12 +601,13 @@ class FormMail
{ {
if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes'; if (! isset($this->ckeditortoolbar)) $this->ckeditortoolbar = 'dolibarr_notes';
if(! empty($conf->global->MAIL_USE_SIGN) && $this->fromid > 0) if (empty($conf->global->MAIL_DO_NOT_USE_SIGN) && $this->fromid > 0)
{ {
$fuser=new User($this->db); $fuser=new User($this->db);
$fuser->fetch($this->fromid); $fuser->fetch($this->fromid);
if(!empty($fuser->signature)) { if(! empty($fuser->signature))
{
$defaultmessage.=dol_htmlentitiesbr_decode($fuser->signature); $defaultmessage.=dol_htmlentitiesbr_decode($fuser->signature);
} }
} }