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

Merge pull request #15158 from frederic34/patch-14

Browse Source 
undefined variable
This commit is contained in:
Laurent Destailleur 2020-10-26 19:21:57 +01:00 committed by GitHub
commit 6926610e9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -152,7 +152,7 @@ class DataPolicy
* @param mixed $contact Contact
* @return void
*/
public function sendMailDataPolicyContact($contact)
public static function sendMailDataPolicyContact($contact)
{
global $langs, $conf, $db, $user;
@ -167,6 +167,7 @@ class DataPolicy
} else {
$l = $langs->defaultlang;
}
// TODO Use a dolibarr email template
$s = "DATAPOLICIESSUBJECT_".$l;
$ma = "DATAPOLICIESCONTENT_".$l;
$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
@ -226,7 +227,7 @@ class DataPolicy
* @param Societe $societe Object societe
* @return void
*/
public function sendMailDataPolicyCompany($societe)
public static function sendMailDataPolicyCompany($societe)
{
global $langs, $conf, $db, $user;
@ -242,6 +243,7 @@ class DataPolicy
} else {
$l = $langs->defaultlang;
}
// TODO Use a dolibarr email template
$s = "DATAPOLICIESSUBJECT_".$l;
$ma = "DATAPOLICIESCONTENT_".$l;
$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
@ -264,10 +266,8 @@ class DataPolicy
$actiontypecode = 'AC_EMAIL';
$actionmsg = $langs->transnoentities('MailSentBy').' '.$from.' '.$langs->transnoentities('To').' '.$sendto;
if ($message)
{
if ($sendtocc)
{
if ($message) {
if ($sendtocc) {
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('Bcc').": ".$sendtocc);
}
$actionmsg .= dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
@ -300,7 +300,7 @@ class DataPolicy
* @param Adherent $adherent Member
* @return void
*/
public function sendMailDataPolicyAdherent($adherent)
public static function sendMailDataPolicyAdherent($adherent)
{
global $langs, $conf, $db, $user;
@ -310,9 +310,6 @@ class DataPolicy
$sendto = $adherent->email;
// TODO Use a dolibarr email template
$s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
$ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
$code = md5($adherent->email);
if (!empty($adherent->default_lang)) {
@ -320,6 +317,9 @@ class DataPolicy
} else {
$l = $langs->defaultlang;
}
// TODO Use a dolibarr email template
$s = 'TXTLINKDATAPOLICIESSUBJECT_'.$l;
$ma = 'TXTLINKDATAPOLICIESMESSAGE_'.$l;
$la = 'TXTLINKDATAPOLICIESACCEPT_'.$l;
$lr = 'TXTLINKDATAPOLICIESREFUSE_'.$l;