';
@@ -433,6 +450,10 @@ else
$var=!$var;
print '| '.$langs->trans("MAIN_DISABLE_ALL_MAILS").' | '.yn($conf->global->MAIN_DISABLE_ALL_MAILS).' |
';
+ // Separator
+ $var=!$var;
+ print '| |
';
+
// Method
$var=!$var;
print '| '.$langs->trans("MAIN_MAIL_SENDMODE").' | ';
@@ -491,9 +512,23 @@ else
else print yn(0).' ('.$langs->trans("NotSupported").')';
print ' |
';
+ // Separator
+ $var=!$var;
+ print '| |
';
+
// From
$var=!$var;
- print '| '.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).' | '.$conf->global->MAIN_MAIL_EMAIL_FROM.' |
';
+ print '| '.$langs->trans("MAIN_MAIL_EMAIL_FROM",ini_get('sendmail_from')?ini_get('sendmail_from'):$langs->transnoentities("Undefined")).' | ';
+ print ''.$conf->global->MAIN_MAIL_EMAIL_FROM;
+ if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && ! isValidEmail($conf->global->MAIN_MAIL_EMAIL_FROM)) print img_warning($langs->trans("ErrorBadEMail"));
+ print ' |
';
+
+ // Autocopy to
+ $var=!$var;
+ print '| '.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").' | ';
+ print ''.$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+ if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && ! isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print img_warning($langs->trans("ErrorBadEMail"));
+ print ' |
';
print '';
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index be6b713f949..c8e68ed4dc2 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -387,6 +387,7 @@ class FormMail
print $form->selectarray("receiverccc", $liste, isset($_REQUEST["receiverccc"])?$_REQUEST["receiverccc"]:0);
}
}
+ //if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) print ' '.info_admin("+ ".$conf->global->MAIN_MAIL_AUTOCOPY_TO,1);
print "\n";
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 6cf75efbd30..e81805c2edc 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -213,6 +213,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_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
MAIN_MAIL_SMTPS_ID=SMTP ID if authentication required
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index bd6d8b117b0..8b209aea829 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -213,6 +213,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_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
MAIN_MAIL_SMTPS_ID= SMTP Authentification ID si authentification SMTP requise
diff --git a/htdocs/lib/CMailFile.class.php b/htdocs/lib/CMailFile.class.php
index d64dca0a14a..85c02046480 100644
--- a/htdocs/lib/CMailFile.class.php
+++ b/htdocs/lib/CMailFile.class.php
@@ -24,7 +24,7 @@
/**
* \file htdocs/lib/CMailFile.class.php
- * \brief Fichier de la classe permettant d'envoyer des mail avec attachements
+ * \brief File of class to send emails (with attachments or not)
* \version $Id$
* \author Dan Potter.
* \author Eric Seigne
@@ -33,7 +33,7 @@
/**
* \class CMailFile
- * \brief Classe d'envoi de mails et pieces jointes. Encapsule mail() avec d'eventuels attachements.
+ * \brief Class to send emails (with attachments or not)
* \remarks Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
* \remarks $mailfile->sendfile();
*/
@@ -165,6 +165,9 @@ class CMailFile
}
}
+ // Add autocopy to
+ if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) $addr_bcc.=($addr_bcc?', ':'').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+
// Action according to choosed sending method
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail')
{
diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php
index 73916db2846..f1ef768f73c 100644
--- a/htdocs/lib/functions.lib.php
+++ b/htdocs/lib/functions.lib.php
@@ -1512,7 +1512,7 @@ function img_mime($file,$alt='')
/**
* \brief Show information for admin users
* \param text Text info
- * \param infoonimgalt Info is shown on alt of star picto, otherwise it is show on output
+ * \param infoonimgalt Info is shown only on alt of star picto, otherwise it is show on output after the star picto
* \return string String with info text
*/
function info_admin($texte,$infoonimgalt=0)