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

- check for broken admin-e-mail if phpMailerClass validation fails

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-04-26 12:28:05 +00:00
parent 62fa764b4c
commit fd6a0597a6
5 changed files with 48 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/init.php
View File

@@ -414,12 +414,14 @@ if($page == '')
/**
* Initialize the mailingsystem
*/
$mail = new PHPMailer();
// set return-to address and custom sender-name, see #76
$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
if ($settings['panel']['adminmail_return'] != '') {
$mail->AddReplyTo($settings['panel']['adminmail_return'], $settings['panel']['adminmail_defname']);
if(PHPMailer::ValidateAddress($settings['panel']['adminmail']) !== false)
{
$mail = new PHPMailer();
// set return-to address and custom sender-name, see #76
$mail->SetFrom($settings['panel']['adminmail'], $settings['panel']['adminmail_defname']);
if ($settings['panel']['adminmail_return'] != '') {
$mail->AddReplyTo($settings['panel']['adminmail_return'], $settings['panel']['adminmail_defname']);
}
}
?>