From 9ca8ab99cd877907390acbbc4ff6558b48fcb2c3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 2 Sep 2011 18:25:11 +0000 Subject: [PATCH] New: Add warning if using bad email --- htdocs/admin/mailing.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php index 59c203da888..efb6e394834 100644 --- a/htdocs/admin/mailing.php +++ b/htdocs/admin/mailing.php @@ -1,6 +1,6 @@ - * Copyright (C) 2005-2009 Laurent Destailleur + * Copyright (C) 2005-2011 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ require("../main.inc.php"); require_once(DOL_DOCUMENT_ROOT."/lib/admin.lib.php"); $langs->load("admin"); +$langs->load("mails"); if (!$user->admin) accessforbidden(); @@ -55,12 +56,12 @@ if ($_POST["action"] == 'setvalue' && $user->admin) * View */ -llxHeader(); +llxHeader('',$langs->trans("MailingSetup")); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("MailingSetup"),$linkback,'setup'); -if ($mesg) print '
'.$mesg; +dol_htmloutput_mesg($mesg); print '
'; print '
'; @@ -79,12 +80,14 @@ $var=!$var; print ''; print $langs->trans("MailingEMailFrom").''; print ''; +if (!empty($conf->global->MAILING_EMAIL_FROM) && ! isValidEmail($conf->global->MAILING_EMAIL_FROM)) print ' '.img_warning($langs->trans("BadEMail")); print ''; $var=!$var; print ''; print $langs->trans("MailingEMailError").''; print ''; +if (!empty($conf->global->MAILING_EMAIL_ERRORSTO) && ! isValidEmail($conf->global->MAILING_EMAIL_ERRORSTO)) print ' '.img_warning($langs->trans("BadEMail")); print ''; print '';