';
// Autocopy to
$var=!$var;
@@ -723,5 +737,5 @@ else
$db->close();
-llxFooter('$Date: 2011/07/09 05:28:41 $ - $Revision: 1.71 $');
+llxFooter('$Date: 2011/07/09 06:10:06 $ - $Revision: 1.72 $');
?>
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 3164f86d8e1..25c96d54498 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -1,6 +1,5 @@
- * Copyright (C) 2005-2011 Regis Houssin
+/* Copyright (C) 2005-2010 Laurent Destailleur
* Copyright (C) 2010-2011 Juanjo Menent
*
* This program is free software; you can redistribute it and/or modify
@@ -22,7 +21,7 @@
* \file htdocs/core/class/html.formmail.class.php
* \ingroup core
* \brief Fichier de la classe permettant la generation du formulaire html d'envoi de mail unitaire
- * \version $Id: html.formmail.class.php,v 1.31 2011/07/10 20:03:41 eldy Exp $
+ * \version $Id: html.formmail.class.php,v 1.29 2011/07/09 06:10:07 hregis Exp $
*/
require_once(DOL_DOCUMENT_ROOT ."/core/class/html.form.class.php");
@@ -124,9 +123,9 @@ class FormMail
/**
* Add a file into the list of attached files (stored in SECTION array)
*
- * @param string $path Full absolute path on filesystem of file, including file name
- * @param string $file Only filename
- * @param string $type Mime type
+ * @param $path
+ * @param $file
+ * @param $type
*/
function add_attached_files($path,$file,$type)
{
@@ -505,27 +504,14 @@ class FormMail
$out.= '
';
$out.= '
'.$langs->trans("MailFile").'
';
$out.= '
';
- // FIXME Trick to have param removedfile containing nb of image to delete. But this does not works without javascript
- $out.= ''."\n";
- $out.= ''."\n";
+ //print '
';
if (sizeof($listofpaths))
{
foreach($listofpaths as $key => $val)
{
- $out.= '
';
+ $out.= img_mime($listofnames[$key]).' '.$listofnames[$key];
+ if (! $this->withfilereadonly) $out.= ' ';
+ $out.= ' ';
}
}
else
@@ -534,9 +520,11 @@ class FormMail
}
if ($this->withfile == 2) // Can add other files
{
+ //print '
';
$out.= '';
$out.= ' ';
$out.= '';
+ //print '
';
}
$out.= "
\n";
}
@@ -556,7 +544,7 @@ class FormMail
if ($this->param["models"]=='invoice_supplier_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendSupplierInvoice"); }
if ($this->param["models"]=='shipping_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendShipping"); }
if ($this->param["models"]=='fichinter_send') { $defaultmessage=$langs->transnoentities("PredefinedMailContentSendFichInter"); }
-
+
if ($conf->paypal->enabled && $conf->global->PAYPAL_ADD_PAYMENT_URL)
{
require_once(DOL_DOCUMENT_ROOT."/paypal/lib/paypal.lib.php");
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 9f153916ea5..0f43c1c9e82 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -229,6 +229,7 @@ MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (By default in php.ini: %s)
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Not defined into PHP on Unix like systems)
MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Not defined into PHP on Unix like systems)
MAIN_MAIL_EMAIL_FROM=Sender e-mail for automatic emails (By default in php.ini: %s)
+MAIN_MAIL_ERRORS_TO=Sender e-mail used for error returns emails sent
MAIN_MAIL_AUTOCOPY_TO= Send systematically a hidden carbon-copy of all sent emails to
MAIN_DISABLE_ALL_MAILS=Disable all e-mails sendings (for test purposes or demos)
MAIN_MAIL_SENDMODE=Method to use to send EMails
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 2729073a3b8..3cb19e89ba8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -230,6 +230,7 @@ MAIN_MAIL_SMTP_SERVER= Nom host ou ip du serveur SMTP/SMTPS (Par défaut dans ph
MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike= Port du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike= Nom host ou ip du serveur SMTP/SMTPS (Non défini dans le PHP sur les systèmes de type Unix)
MAIN_MAIL_EMAIL_FROM= EMail émetteur pour envoi emails automatiques (Par défaut dans php.ini: %s)
+MAIN_MAIL_ERRORS_TO=EMail utilisé pour les retours d'erreurs des mails envoyés
MAIN_MAIL_AUTOCOPY_TO= Envoyer systématiquement une copie cachée des mails envoyés à
MAIN_DISABLE_ALL_MAILS= Désactiver globalement tout envoi de mails (pour mode test ou démos)
MAIN_MAIL_SENDMODE= Méthode d'envoi des mails