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

New: Mails fields of form not lost if there is an error in sending mail

Browse Source
This commit is contained in:
Laurent Destailleur 2009-05-09 17:13:03 +00:00
parent 2ebb11e0c6
commit d33f8a6d63
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/facture.php
View File

@ -1303,6 +1303,8 @@ if (($_POST['action'] == 'send' || $_POST['action'] == 'relance') && ! $_POST['a
$mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'</div>'; $mesg='<div class="error">'.$langs->trans('ErrorFailedToReadEntity',$langs->trans("Invoice")).'</div>';
dol_syslog('Impossible de lire les données de la facture. Le fichier facture n\'a peut-être pas été généré.'); dol_syslog('Impossible de lire les données de la facture. Le fichier facture n\'a peut-être pas été généré.');
} }
$_GET['action'] = 'presend';
} }
/* /*

17
htdocs/html.formmail.class.php
View File

@ -284,11 +284,11 @@ class FormMail
} }
else else
{ {
print "<input size=\"".(is_array($this->withto)?"30":"60")."\" name=\"sendto\" value=\"".(! is_array($this->withto) && ! is_numeric($this->withto)?$this->withto:"")."\">"; print "<input size=\"".(is_array($this->withto)?"30":"60")."\" name=\"sendto\" value=\"".(! is_array($this->withto) && ! is_numeric($this->withto)? (isset($_POST["sendto"])?$_POST["sendto"]:$this->withto) :"")."\">";
if (is_array($this->withto)) if (is_array($this->withto))
{ {
print " ".$langs->trans("or")." "; print " ".$langs->trans("or")." ";
$form->select_array("receiver",$this->withto); print $form->selectarray("receiver", isset($_POST["receiver"])?$_POST["receiver"]:$this->withto);
} }
} }
print "</td></tr>\n"; print "</td></tr>\n";
@ -306,11 +306,11 @@ class FormMail
} }
else else
{ {
print "<input size=\"".(is_array($this->withtocc)?"30":"60")."\" name=\"sendtocc\" value=\"".((! is_array($this->withtocc) && ! is_numeric($this->withtocc))?$this->withtocc:"")."\">"; print "<input size=\"".(is_array($this->withtocc)?"30":"60")."\" name=\"sendtocc\" value=\"".((! is_array($this->withtocc) && ! is_numeric($this->withtocc))? (isset($_POST["sendtocc"])?$_POST["sendtocc"]:$this->withtocc) : (isset($_POST["sendtocc"])?$_POST["sendtocc"]:"") )."\">";
if (is_array($this->withtocc)) if (is_array($this->withtocc))
{ {
print " ".$langs->trans("or")." "; print " ".$langs->trans("or")." ";
$form->select_array("receivercc",$this->withtocc); $form->select_array("receivercc", isset($_POST["receivercc"])?$_POST["receivercc"]:$this->withtocc);
} }
} }
print "</td></tr>\n"; print "</td></tr>\n";
@ -328,11 +328,11 @@ class FormMail
} }
else else
{ {
print "<input size=\"".(is_array($this->withtoccc)?"30":"60")."\" name=\"sendtoccc\" value=\"".((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))?$this->withtoccc:"")."\">"; print "<input size=\"".(is_array($this->withtoccc)?"30":"60")."\" name=\"sendtoccc\" value=\"".((! is_array($this->withtoccc) && ! is_numeric($this->withtoccc))? (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:$this->withtoccc) : (isset($_POST["sendtoccc"])?$_POST["sendtoccc"]:"") )."\">";
if (is_array($this->withtoccc)) if (is_array($this->withtoccc))
{ {
print " ".$langs->trans("or")." "; print " ".$langs->trans("or")." ";
$form->select_array("receiverccc",$this->withtoccc); $form->select_array("receiverccc", isset($_POST["receiverccc"])?$_POST["receiverccc"]:$this->withtoccc);
} }
} }
print "</td></tr>\n"; print "</td></tr>\n";
@ -349,7 +349,7 @@ class FormMail
} }
else else
{ {
print $form->selectyesno('deliveryreceipt',0,1); print $form->selectyesno('deliveryreceipt', (isset($_POST["deliveryreceipt"])?$_POST["deliveryreceipt"]:0) ,1);
} }
print "</td></tr>\n"; print "</td></tr>\n";
@ -370,7 +370,7 @@ class FormMail
} }
else else
{ {
print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"".$this->withtopic."\">"; print "<input type=\"text\" size=\"60\" name=\"subject\" value=\"". (isset($_POST["subject"])?$_POST["subject"]:$this->withtopic) ."\">";
} }
print "</td></tr>\n"; print "</td></tr>\n";
} }
@ -417,6 +417,7 @@ class FormMail
if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); } if ($this->param["models"]=='order_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendOrder"); }
$defaultmessage=make_substitutions($defaultmessage,$this->substit); $defaultmessage=make_substitutions($defaultmessage,$this->substit);
if (isset($_POST["message"])) $defaultmessage=$_POST["message"];
print "<tr>"; print "<tr>";
print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>"; print "<td width=\"180\" valign=\"top\">".$langs->trans("MailText")."</td>";