';
print ' ';
@@ -454,26 +454,26 @@ if ($action == 'edit')
else
{
dol_fiche_head($head, 'common', '', -1);
-
+
print $langs->trans("EMailsDesc")."
';
print '| '.$langs->trans("Parameter").' | '.$langs->trans("Value").' |
';
// Disable
-
+
print '| '.$langs->trans("MAIN_DISABLE_ALL_MAILS").' | '.yn($conf->global->MAIN_DISABLE_ALL_MAILS).' |
';
// Separator
-
+
print '| |
';
// Method
-
+
print '| '.$langs->trans("MAIN_MAIL_SENDMODE").' | ';
$text=$listofmethods[$conf->global->MAIN_MAIL_SENDMODE];
if (empty($text)) $text=$langs->trans("Undefined").img_warning();
@@ -481,7 +481,7 @@ else
print ' |
';
// Host server
-
+
if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
{
print '| '.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
@@ -492,7 +492,7 @@ else
}
// Port
-
+
if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail'))
{
print '| '.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").' | '.$langs->trans("SeeLocalSendMailSetup").' |
';
@@ -503,21 +503,21 @@ else
}
// SMTPS ID
-
+
if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
{
print '| '.$langs->trans("MAIN_MAIL_SMTPS_ID").' | '.$conf->global->MAIN_MAIL_SMTPS_ID.' |
';
}
// SMTPS PW
-
+
if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
{
print '| '.$langs->trans("MAIN_MAIL_SMTPS_PW").' | '.preg_replace('/./','*',$conf->global->MAIN_MAIL_SMTPS_PW).' |
';
}
// TLS
-
+
print '| '.$langs->trans("MAIN_MAIL_EMAIL_TLS").' | ';
if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
{
@@ -531,7 +531,7 @@ else
print ' |
';
// STARTTLS
-
+
print '| '.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").' | ';
if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))
{
@@ -545,18 +545,18 @@ else
print ' |
';
// Separator
-
+
print '| |
';
// 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 ' |
';
// Default from type
-
+
print '| '.$langs->trans('MAIN_MAIL_DEFAULT_FROMTYPE').' | ';
print '';
if($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE === 'user'){
@@ -567,18 +567,18 @@ else
print ' |
';
// Separator
-
+
print '| |
';
// Errors To
-
+
print '| '.$langs->trans("MAIN_MAIL_ERRORS_TO").' | ';
print ''.$conf->global->MAIN_MAIL_ERRORS_TO;
if (! empty($conf->global->MAIN_MAIL_ERRORS_TO) && ! isValidEmail($conf->global->MAIN_MAIL_ERRORS_TO)) print img_warning($langs->trans("ErrorBadEMail"));
print ' |
';
// Autocopy to
-
+
print '| '.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").' | ';
print '';
if (! empty($conf->global->MAIN_MAIL_AUTOCOPY_TO))
@@ -591,12 +591,12 @@ else
print ' ';
}
print ' |
';
-
+
print '
';
dol_fiche_end();
-
-
+
+
if ($conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->MAIN_FIX_FOR_BUGGED_MTA))
{
print '
';
@@ -614,7 +614,7 @@ else
print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA"));
}
-
+
// Boutons actions
print '
';
@@ -647,7 +647,7 @@ else
$text = $langs->trans("WarningPHPMail");
print info_admin($text);
}
-
+
// Run the test to connect
if ($action == 'testconnect')
{
@@ -673,6 +673,7 @@ else
// Show email send test form
if ($action == 'test' || $action == 'testhtml')
{
+ print '
';
print load_fiche_titre($action == 'testhtml'?$langs->trans("DoTestSendHTML"):$langs->trans("DoTestSend"));
// Cree l'objet formulaire mail
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 17d4d066569..8f4deb53edf 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -1010,7 +1010,8 @@ else
// Affichage formulaire de TEST
if ($action == 'test')
{
- print load_fiche_titre($langs->trans("TestMailing"));
+ print '
';
+ print load_fiche_titre($langs->trans("TestMailing"));
// Create l'objet formulaire mail
include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 3e8580d5350..67dbca101f8 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -2281,7 +2281,7 @@ if ($action == 'create')
// Send
if ($object->statut == Propal::STATUS_VALIDATED || $object->statut == Propal::STATUS_SIGNED) {
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->propal->propal_advance->send) {
- print '
';
+ print '
';
} else
print '
';
}
@@ -2412,6 +2412,7 @@ if ($action == 'create')
$file = $fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendPropalByMail'));
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index e2db47a6c9d..83135a8c0f5 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -2443,7 +2443,7 @@ if ($action == 'create' && $user->rights->commande->creer)
// Send
if ($object->statut > Commande::STATUS_DRAFT) {
if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send)) {
- print '
';
+ print '
';
} else
print '
';
}
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 3f9c7b9319b..a4608b59a7d 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -4075,7 +4075,7 @@ else if ($id > 0 || ! empty($ref))
print '
' . $langs->trans('SendByMail') . '
';
} else {
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->facture->invoice_advance->send) {
- print '
';
+ print '
';
} else
print '
';
}
@@ -4332,6 +4332,7 @@ else if ($id > 0 || ! empty($ref))
$file = $fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans($titreform));
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 58b1608f44b..b2ab3bf3cb8 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -2162,6 +2162,7 @@ else
$file = $fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendContractByMail'));
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 72044d68fcf..efc64d84396 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -2037,7 +2037,7 @@ else if ($id || $ref)
{
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send)
{
- print '
id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'';
+ print '
id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'';
}
else print '
'.$langs->trans('SendByMail').'';
}
@@ -2162,6 +2162,7 @@ else if ($id || $ref)
$file=$fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendShippingByEMail'));
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index c084806c4a6..108aaf7a23a 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1598,7 +1598,7 @@ else if ($id > 0 || ! empty($ref))
{
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->ficheinter->ficheinter_advance->send)
{
- print '
';
+ print '
';
}
else print '
';
}
@@ -1753,6 +1753,7 @@ else if ($id > 0 || ! empty($ref))
$file=$fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendInterventionByMail'));
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index dda4a0d7254..4deca7ea836 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -2174,6 +2174,7 @@ elseif (! empty($object->id))
$file=$fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendOrderByMail'));
@@ -2572,7 +2573,7 @@ elseif (! empty($object->id))
{
if ($user->rights->fournisseur->commande->commander)
{
- print '
id.'&action=presend&mode=init">'.$langs->trans('SendByMail').'';
+ print '
id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendByMail').'';
}
}
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b915af93199..95e80cd7933 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2660,7 +2660,7 @@ else
{
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send)
{
- print '
';
+ print '
';
}
else print '
'.$langs->trans('SendByMail').'
';
}
@@ -2836,7 +2836,8 @@ else
$file=$fileparams['fullname'];
}
- print '
';
+ print '
';
+ print '
';
print '
';
print load_fiche_titre($langs->trans('SendBillByMail'));
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 56e0ea1d3ed..03dfd62f5d3 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -426,6 +426,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
if (empty($reshook))
{
+ // Send
+ print '
'."\n";
+
if ($user->rights->mymodule->write)
{
print '
'."\n";
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index e26b4733c84..b5afba996b8 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -2462,7 +2462,9 @@ else
$action='send';
$modelmail='thirdparty';
- //print '
';
+ print '
';
+ print '
';
+ print '
';
print load_fiche_titre($langs->trans($titreform));
dol_fiche_head();
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 72c9793b40b..d7d967d24b8 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1740,7 +1740,7 @@ if ($action == 'create')
// Send
if ($object->statut == SupplierProposal::STATUS_VALIDATED || $object->statut == SupplierProposal::STATUS_SIGNED) {
if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->supplier_proposal->send_advance) {
- print '
';
+ print '
';
} else
print '
';
}
@@ -1854,6 +1854,7 @@ if ($action == 'create')
$file = $fileparams['fullname'];
}
+ print '
';
print '
';
print '
';
print load_fiche_titre($langs->trans('SendAskByMail'));
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 8400a95d370..9d9684371a9 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1669,6 +1669,7 @@ else
$action='send';
$modelmail='user';
+ print '
';
print '
';
print load_fiche_titre($langs->trans($titreform));