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

Update datapolicy.class.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2020-10-26 00:05:43 +01:00 committed by GitHub
parent 44152c9343
commit c2b6ff969a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/datapolicy/class/datapolicy.class.php
View File

@ -152,7 +152,7 @@ class DataPolicy
* @param mixed $contact Contact * @param mixed $contact Contact
* @return void * @return void
*/ */
public function sendMailDataPolicyContact($contact) public static function sendMailDataPolicyContact($contact)
{ {
global $langs, $conf, $db, $user; global $langs, $conf, $db, $user;
@ -227,7 +227,7 @@ class DataPolicy
* @param Societe $societe Object societe * @param Societe $societe Object societe
* @return void * @return void
*/ */
public function sendMailDataPolicyCompany($societe) public static function sendMailDataPolicyCompany($societe)
{ {
global $langs, $conf, $db, $user; global $langs, $conf, $db, $user;
@ -266,10 +266,8 @@ class DataPolicy
$actiontypecode = 'AC_EMAIL'; $actiontypecode = 'AC_EMAIL';
$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto; $actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
if ($message) if ($message) {
{ if ($sendtocc) {
if ($sendtocc)
{
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc); $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
} }
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject); $actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
@ -302,7 +300,7 @@ class DataPolicy
* @param Adherent $adherent Member * @param Adherent $adherent Member
* @return void * @return void
*/ */
public function sendMailDataPolicyAdherent($adherent) public static function sendMailDataPolicyAdherent($adherent)
{ {
global $langs, $conf, $db, $user; global $langs, $conf, $db, $user;