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

Fix: EMail content can't be empty

Browse Source 
New: Use confirm box to send email
New: Show command line to send even if send by web is allowed
This commit is contained in:
Laurent Destailleur 2009-12-30 00:18:01 +00:00
parent 9747506cbd
commit dca2580ea1
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
htdocs/comm/mailing/fiche.php
View File

@ -90,7 +90,7 @@ if ($_POST["action"] == 'confirm_clone' && $_POST['confirm'] == 'yes')
} }
// Action send emailing for everybody // Action send emailing for everybody
if ($_POST["action"] == 'sendallconfirmed' && $_POST['confirm'] == 'yes') if ($_REQUEST["action"] == 'sendallconfirmed' && $_REQUEST['confirm'] == 'yes')
{ {
if (empty($conf->global->MAILING_LIMIT_SENDBYWEB)) if (empty($conf->global->MAILING_LIMIT_SENDBYWEB))
{ {
@ -104,7 +104,7 @@ if ($_POST["action"] == 'sendallconfirmed' && $_POST['confirm'] == 'yes')
else else
{ {
$mil=new Mailing($db); $mil=new Mailing($db);
$result=$mil->fetch($_GET['id']); $result=$mil->fetch($_REQUEST['id']);
if ($mil->statut == 0) if ($mil->statut == 0)
{ {
@ -228,7 +228,7 @@ if ($_POST["action"] == 'sendallconfirmed' && $_POST['confirm'] == 'yes')
// Mail failed // Mail failed
$nbko++; $nbko++;
dol_syslog("comm/mailing/fiche.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG); dol_syslog("comm/mailing/fiche.php: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_WARNING);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=-1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid; $sql.=" SET statut=-1, date_envoi=".$db->idate(gmmktime())." WHERE rowid=".$obj->rowid;
@ -339,6 +339,7 @@ if ($_POST["action"] == 'add')
if (! $mil->titre) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTitle")); if (! $mil->titre) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTitle"));
if (! $mil->sujet) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic")); if (! $mil->sujet) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $mil->body) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));
if (! $message) if (! $message)
{ {
@ -369,11 +370,23 @@ if ($_POST["action"] == 'update' && empty($_POST["cancel"]))
$mil->bgcolor = trim($_POST["bgcolor"]); $mil->bgcolor = trim($_POST["bgcolor"]);
$mil->bgimage = trim($_POST["bgimage"]); $mil->bgimage = trim($_POST["bgimage"]);
if ($mil->update($user)) if (! $mil->titre) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTitle"));
if (! $mil->sujet) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailTopic"));
if (! $mil->body) $message.=($message?'<br>':'').$langs->trans("ErrorFieldRequired",$langs->trans("MailBody"));
if (! $message)
{ {
Header("Location: fiche.php?id=".$mil->id); if ($mil->update($user) >= 0)
exit; {
Header("Location: fiche.php?id=".$mil->id);
exit;
}
$message=$mil->error;
} }
$message='<div class="error">'.$message.'</div>';
$_GET["action"]="edit";
$_GET["id"]=$_POST["id"];
} }
// Action confirmation validation // Action confirmation validation
@ -575,7 +588,7 @@ else
{ {
$text=$langs->trans('ConfirmSendingEmailing').'<br>'; $text=$langs->trans('ConfirmSendingEmailing').'<br>';
$text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB); $text.=$langs->trans('LimitSendingEmailing',$conf->global->MAILING_LIMIT_SENDBYWEB);
$ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$_REQUEST['id'],$langs->trans('SendMailing'),$text,'sendallconfirmed'); $ret=$html->form_confirm($_SERVER['PHP_SELF'].'?id='.$_REQUEST['id'],$langs->trans('SendMailing'),$text,'sendallconfirmed','','',2);
if ($ret == 'html') print '<br>'; if ($ret == 'html') print '<br>';
} }
} }
@ -648,7 +661,7 @@ else
if ($mesg) print $mesg; if ($mesg) print $mesg;
if ($_GET["action"] == 'sendall' && empty($conf->global->MAILING_LIMIT_SENDBYWEB)) if ($_GET["action"] == 'sendall')
{ {
// Pour des raisons de securite, on ne permet pas cette fonction via l'IHM, // Pour des raisons de securite, on ne permet pas cette fonction via l'IHM,
// on affiche donc juste un message // on affiche donc juste un message
@ -749,6 +762,7 @@ else
/* /*
* Mailing en mode edition * Mailing en mode edition
*/ */
if ($message) print "$message<br>";
print '<form name="edit_mailing" action="fiche.php" method="post">'."\n"; print '<form name="edit_mailing" action="fiche.php" method="post">'."\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';

2
htdocs/langs/en_US/mails.lang
View File

@ -88,7 +88,7 @@ SearchAMailing=Search mailing
SendMailing=Send emailing SendMailing=Send emailing
SendMail=Send email SendMail=Send email
SentBy=Sent by SentBy=Sent by
MailingNeedCommand=For securities reason, sending an emailing can only be performed from command line. Ask your administrator to launch the following command to send the emailing to all recipients: MailingNeedCommand=For securities reason, sending an emailing should be performed from command line. Ask your administrator to launch the following command to send the emailing to all recipients:
MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session. MailingNeedCommand2=You can however send them online by adding parameter MAILING_LIMIT_SENDBYWEB with value of max number of emails you want to send by session.
ConfirmSendingEmailing=Are you sure you want to send mailing ? ConfirmSendingEmailing=Are you sure you want to send mailing ?
LimitSendingEmailing=On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session. LimitSendingEmailing=On line sending of emailings are limited for security and timeout reasons to <b>%s</b> recipients by sending session.