maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- set correct html-linebreaks when sending e-mails

Browse Source 
- disallow email-add form when no (email-)domain is added yet
This commit is contained in:
Michael Kaufmann (d00p)
2010-03-05 07:13:00 +00:00
parent b5465f602f
commit 491e5363a7
6 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
customer_email.php
View File

@@ -433,7 +433,7 @@ elseif($page == 'accounts')
$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
$mail->Subject = $mail_subject;
$mail->AltBody = $mail_body;
$mail->MsgHTML($mail_body);
$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($email_full, getCorrectUserSalutation($userinfo));
$mail->Send();
} catch(phpmailerException $e) {
@@ -464,7 +464,7 @@ elseif($page == 'accounts')
$mail->SetFrom($admin['email'], getCorrectUserSalutation($admin));
$mail->Subject = $mail_subject;
$mail->AltBody = $mail_body;
$mail->MsgHTML($mail_body);
$mail->MsgHTML(str_replace("\n", "<br />", $mail_body));
$mail->AddAddress($idna_convert->encode($alternative_email), getCorrectUserSalutation($userinfo));
$mail->Send();
} catch(phpmailerException $e) {