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

New: Ajout fonction de test des mails sur la page de configuration des mails

Browse Source
This commit is contained in:
Laurent Destailleur 2007-06-16 16:59:52 +00:00
parent 5e1c78ddd0
commit ebbe5d687c
2 changed files with 111 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/admin/limits.php
View File

@ -37,11 +37,12 @@ if (!$user->admin)
if (isset($_POST["action"]) && $_POST["action"] == 'update')
{
if ($_POST["MAIN_MAX_DECIMALS_UNIT"] > 8
|| $_POST["MAIN_MAX_DECIMALS_TTC"] > 8
|| $_POST["MAIN_MAX_DECIMALS_SHOWN"] > 8)
$MAXDEC=8;
if ($_POST["MAIN_MAX_DECIMALS_UNIT"] > $MAXDEC
|| $_POST["MAIN_MAX_DECIMALS_TTC"] > $MAXDEC
|| $_POST["MAIN_MAX_DECIMALS_SHOWN"] > $MAXDEC)
{
$mesg='<div class="error">'.$langs->trans("ErrorDecimalLargerThanAreForbidden").'</div>';
$mesg='<div class="error">'.$langs->trans("ErrorDecimalLargerThanAreForbidden",$MAXDEC).'</div>';
}
else
{

107
htdocs/admin/mails.php
View File

@ -30,10 +30,22 @@ require("./pre.inc.php");
$langs->load("companies");
$langs->load("products");
$langs->load("admin");
$langs->load("mails");
if (!$user->admin)
accessforbidden();
$substitutionarrayfortest=array(
'__ID__' => 'TESTIdRecord',
'__EMAIL__' => 'TESTEMail',
'__LASTNAME__' => 'TESTLastname',
'__FIRSTNAME__' => 'TESTFirstname'
);
/*
* Actions
*/
if (isset($_POST["action"]) && $_POST["action"] == 'update')
{
@ -48,6 +60,58 @@ if (isset($_POST["action"]) && $_POST["action"] == 'update')
exit;
}
// Action envoi test mailing
if ($_POST["action"] == 'send' && ! $_POST["cancel"])
{
$sendto = $_POST["sendto"];
$email_from= $conf->global->MAIN_MAIL_EMAIL_FROM;
$subject="Dolibarr test";
$body="This is a test";
if (! $sendto)
{
$message='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->trans("MailTo")).'</div>';
}
if ($sendto)
{
require_once(DOL_DOCUMENT_ROOT."/lib/CMailFile.class.php");
$arr_file = array();
$arr_mime = array();
$arr_name = array();
// Le message est-il en html
$msgishtml=0; // Non par defaut
if ($conf->fckeditor->enabled && $conf->global->FCKEDITOR_ENABLE_MAILING) $msgishtml=1;
if (eregi('[ \t]*<html>',$message)) $msgishtml=1;
// Pratique les substitutions sur le sujet et message
$subject=make_substitutions($subject,$substitutionarrayfortest);
$body=make_substitutions($body,$substitutionarrayfortest);
$mailfile = new CMailFile($subject,$sendto,$email_from,$body,
$arr_file,$arr_mime,$arr_name,
'', '', 0, $msgishtml);
$result=$mailfile->sendfile();
if ($result)
{
$message='<div class="ok">'.$langs->trans("MailSuccessfulySent",$email_from,$sendto).'</div>';
}
else
{
$message='<div class="error">'.$langs->trans("ResultKo").'<br>'.$mailfile->error.' '.$result.'</div>';
}
$_GET["action"]='';
}
}
/*
* Affichage page
*/
llxHeader();
@ -56,6 +120,8 @@ print_fiche_titre($langs->trans("EMailsSetup"),'','setup');
print $langs->trans("EMailsDesc")."<br>\n";
print "<br>\n";
if ($message) print $message.'<br>';
if (isset($_GET["action"]) && $_GET["action"] == 'edit')
{
@ -112,11 +178,50 @@ else
$var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("MAIN_DISABLE_ALL_MAILS").'</td><td>'.yn($conf->global->MAIN_DISABLE_ALL_MAILS).'</td></tr>';
print '</table><br>';
print '</table>';
// Boutons actions
print '<div class="tabsAction">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=test">'.$langs->trans("DoTest").'</a>';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Edit").'</a>';
print '</div>';
// Affichage formulaire de TEST
if ($_GET["action"] == 'test')
{
print '<br>';
print_titre($langs->trans("TestMailing"));
// Créé l'objet formulaire mail
include_once("../html.formmail.class.php");
$formmail = new FormMail($db);
$formmail->fromname = $conf->global->MAIN_MAIL_EMAIL_FROM;
$formmail->frommail = $conf->global->MAIN_MAIL_EMAIL_FROM;
$formmail->withsubstit=0;
$formmail->withfrom=1;
$formmail->withto=$user->email?$user->email:1;
$formmail->withcc=0;
$formmail->withtopic=0;
$formmail->withtopicreadonly=1;
$formmail->withfile=0;
$formmail->withbody=0;
$formmail->withbodyreadonly=1;
$formmail->withcancel=1;
// Tableau des substitutions
$formmail->substit=$substitutionarrayfortest;
// Tableau des paramètres complémentaires du post
$formmail->param["action"]="send";
$formmail->param["models"]="body";
$formmail->param["mailid"]=$mil->id;
$formmail->param["returnurl"]=DOL_URL_ROOT."/admin/mails.php";
$formmail->show_form();
print '<br>';
}
}