Skip to content
Snippets Groups Projects
Commit 2ca2e35a authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: errors in substitutions

parent f4b885b7
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/comm/mailing/fiche.php
+ 8
− 8
View file @ 2ca2e35a
...@@ -85,7 +85,7 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -85,7 +85,7 @@ if ($_POST["action"] == 'sendallconfirmed')
{ {
$obj = $db->fetch_object($resql); $obj = $db->fetch_object($resql);
dolibarr_syslog("mailing-send: mailing ".$id); dolibarr_syslog("mailing-send: mailing ".$id, LOG_DEBUG);
$id = $obj->rowid; $id = $obj->rowid;
$subject = $obj->sujet; $subject = $obj->sujet;
...@@ -116,7 +116,7 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -116,7 +116,7 @@ if ($_POST["action"] == 'sendallconfirmed')
if ($num) if ($num)
{ {
dolibarr_syslog("mailing-send: target number = $num"); dolibarr_syslog("mailing-send: nb of targets = ".$num, LOG_DEBUG);
// Positionne date debut envoi // Positionne date debut envoi
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=SYSDATE() WHERE rowid=".$id; $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=SYSDATE() WHERE rowid=".$id;
$resql2=$db->query($sql); $resql2=$db->query($sql);
...@@ -147,11 +147,11 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -147,11 +147,11 @@ if ($_POST["action"] == 'sendallconfirmed')
); );
$substitutionisok=true; $substitutionisok=true;
$subject2=make_substitutions($subject,$substitutionarray); $newsubject=make_substitutions($subject,$substitutionarray);
$message2=make_substitutions($message,$substitutionarray); $newmessage=make_substitutions($message,$substitutionarray);
// Fabrication du mail // Fabrication du mail
$mail = new CMailFile($subject2, $sendto, $from, $message2, $mail = new CMailFile($newsubject, $sendto, $from, $newmessage,
array(), array(), array(), array(), array(), array(),
'', '', 0, $msgishtml); '', '', 0, $msgishtml);
$mail->errors_to = $errorsto; $mail->errors_to = $errorsto;
...@@ -178,7 +178,7 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -178,7 +178,7 @@ if ($_POST["action"] == 'sendallconfirmed')
// Mail envoye avec succes // Mail envoye avec succes
$nbok++; $nbok++;
dolibarr_syslog("mailing-send: ok for #".$i.' - '.$mail->error); dolibarr_syslog("mailing-send: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid; $sql.=" SET statut=1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid;
...@@ -193,7 +193,7 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -193,7 +193,7 @@ if ($_POST["action"] == 'sendallconfirmed')
// Mail en echec // Mail en echec
$nbko++; $nbko++;
dolibarr_syslog("mailing-send: error for #".$i.' - '.$mail->error); dolibarr_syslog("mailing-send: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=-1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid; $sql.=" SET statut=-1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid;
...@@ -213,7 +213,7 @@ if ($_POST["action"] == 'sendallconfirmed') ...@@ -213,7 +213,7 @@ if ($_POST["action"] == 'sendallconfirmed')
if (! $nbko) $statut=3; if (! $nbko) $statut=3;
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id; $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
dolibarr_syslog("mailing-send: update global status sql=".$sql); dolibarr_syslog("mailing-send: update global status sql=".$sql, LOG_DEBUG);
$resql2=$db->query($sql); $resql2=$db->query($sql);
if (! $resql2) if (! $resql2)
{ {
......
scripts/mailing/mailing-send.php
+ 4
− 4
View file @ 2ca2e35a
...@@ -119,7 +119,7 @@ if ($resql) ...@@ -119,7 +119,7 @@ if ($resql)
if ($num) if ($num)
{ {
dolibarr_syslog("mailing-send: nb of targets = ".$num); dolibarr_syslog("mailing-send: nb of targets = ".$num, LOG_DEBUG);
// Positionne date debut envoi // Positionne date debut envoi
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=SYSDATE() WHERE rowid=".$id; $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET date_envoi=SYSDATE() WHERE rowid=".$id;
...@@ -180,7 +180,7 @@ if ($resql) ...@@ -180,7 +180,7 @@ if ($resql)
// Mail envoye avec succes // Mail envoye avec succes
$nbok++; $nbok++;
dolibarr_syslog("mailing-send: ok for #".$i.($mail->error?' - '.$mail->error:'')); dolibarr_syslog("mailing-send: ok for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid; $sql.=" SET statut=1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid;
...@@ -195,7 +195,7 @@ if ($resql) ...@@ -195,7 +195,7 @@ if ($resql)
// Mail en echec // Mail en echec
$nbko++; $nbko++;
dolibarr_syslog("mailing-send: error for #".$i.($mail->error?' - '.$mail->error:'')); dolibarr_syslog("mailing-send: error for #".$i.($mail->error?' - '.$mail->error:''), LOG_DEBUG);
$sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles"; $sql="UPDATE ".MAIN_DB_PREFIX."mailing_cibles";
$sql.=" SET statut=-1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid; $sql.=" SET statut=-1, date_envoi=SYSDATE() WHERE rowid=".$obj->rowid;
...@@ -215,7 +215,7 @@ if ($resql) ...@@ -215,7 +215,7 @@ if ($resql)
if (! $nbko) $statut=3; if (! $nbko) $statut=3;
$sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id; $sql="UPDATE ".MAIN_DB_PREFIX."mailing SET statut=".$statut." WHERE rowid=".$id;
dolibarr_syslog("mailing-send: update global status sql=".$sql); dolibarr_syslog("mailing-send: update global status sql=".$sql, LOG_DEBUG);
$resql2=$db->query($sql); $resql2=$db->query($sql);
if (! $resql2) if (! $resql2)
{ {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment