diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index d482322a054..e9cbdbb8736 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -78,6 +78,10 @@ if ($action == 'update' && empty($_POST["cancel"])) dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW"), 'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS"),'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS"),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_ENABLED", GETPOST("MAIN_MAIL_EMAIL_DKIM_ENABLED"),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_DOMAIN", GETPOST("MAIN_MAIL_EMAIL_DKIM_DOMAIN"),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_SELECTOR", GETPOST("MAIN_MAIL_EMAIL_DKIM_SELECTOR"),'chaine',0,'',$conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY", GETPOST("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY"),'chaine',0,'',$conf->entity); // Content parameters dolibarr_set_const($db, "MAIN_MAIL_EMAIL_FROM", GETPOST("MAIN_MAIL_EMAIL_FROM"), 'chaine',0,'',$conf->entity); dolibarr_set_const($db, "MAIN_MAIL_ERRORS_TO", GETPOST("MAIN_MAIL_ERRORS_TO"), 'chaine',0,'',$conf->entity); @@ -151,26 +155,32 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_EMAIL_TLS").prop("disabled", true); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").hide(); '; if ($linuxlike) { print ' - jQuery("#MAIN_MAIL_SMTP_SERVER").hide(); - jQuery("#MAIN_MAIL_SMTP_PORT").hide(); - jQuery("#smtp_server_mess").show(); - jQuery("#smtp_port_mess").show(); - '; + jQuery("#MAIN_MAIL_SMTP_SERVER").hide(); + jQuery("#MAIN_MAIL_SMTP_PORT").hide(); + jQuery("#smtp_server_mess").show(); + jQuery("#smtp_port_mess").show();'; } else { - print ' - jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true); - jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true); - jQuery("#smtp_server_mess").hide(); - jQuery("#smtp_port_mess").hide(); - '; - } - print ' + print ' + jQuery("#MAIN_MAIL_SMTP_SERVER").prop("disabled", true); + jQuery("#MAIN_MAIL_SMTP_PORT").prop("disabled", true); + jQuery("#smtp_server_mess").hide(); + jQuery("#smtp_port_mess").hide();'; + } + print ' } if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\') { @@ -179,6 +189,14 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.'); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").hide(); jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER").show(); @@ -193,6 +211,14 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_EMAIL_TLS").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val('.$conf->global->MAIN_MAIL_EMAIL_STARTTLS.'); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").val('.$conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED.'); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN").show(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR").show(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").show(); jQuery("#MAIN_MAIL_SMTP_SERVER").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER").show(); @@ -205,16 +231,16 @@ if ($action == 'edit') jQuery("#MAIN_MAIL_SENDMODE").change(function() { initfields(); }); - jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() { + jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() { if (jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val() == 1) jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0); }); jQuery("#MAIN_MAIL_EMAIL_STARTTLS").change(function() { if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1) jQuery("#MAIN_MAIL_EMAIL_TLS").val(0); - }); + }); })'; - print ''."\n"; + print ''."\n"; } print '
'; @@ -368,9 +394,9 @@ if ($action == 'edit') print ''; } - // TLS + // TLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; + print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { if (function_exists('openssl_open')) @@ -383,7 +409,6 @@ if ($action == 'edit') print ''; // STARTTLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) { @@ -396,8 +421,35 @@ if ($action == 'edit') else print yn(0).' ('.$langs->trans("NotSupported").')'; print ''; - // Separator + // DKIM + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").''; + if (! empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer')))) + { + if (function_exists('openssl_open')) + { + print $form->selectyesno('MAIN_MAIL_EMAIL_DKIM_ENABLED',(! empty($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED)?$conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED:0),1); + } + else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + else print yn(0).' ('.$langs->trans("NotSupported").')'; + print ''; + // Domain + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").''; + print ''; + + // Selector + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").''; + print ''; + + // PRIVATE KEY + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").''; + print ''; + print ''; + + // Separator print ' '; // From @@ -554,7 +606,36 @@ else else print yn(0).' ('.$langs->trans("NotSupported").')'; print ''; - // Separator + // DKIM + + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").''; + if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer'))) + { + if (function_exists('openssl_open')) + { + print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED); + } + else print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + else print yn(0).' ('.$langs->trans("NotSupported").')'; + print ''; + + // Domain + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_DOMAIN").''; + print '' . $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN; + print ''; + + // Selector + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_SELECTOR").''; + print '' . $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR; + print ''; + + // PRIVATE KEY + print ''.$langs->trans("MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").''; + print '' . $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY; + print ''; + + // Separator print ' '; diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php index be1eb75a8d1..e99581de1ed 100644 --- a/htdocs/core/class/CMailFile.class.php +++ b/htdocs/core/class/CMailFile.class.php @@ -395,25 +395,32 @@ class CMailFile // Use Swift Mailer library // ------------------------------------------ - $host = dol_getprefix('email'); + $host = dol_getprefix('email'); - require_once DOL_DOCUMENT_ROOT.'/includes/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/EmailParser.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/EmailLexer.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/EmailValidator.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Warning/Warning.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Parser/Parser.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Parser/DomainPart.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Parser/LocalPart.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Validation/EmailValidation.php'; - require_once DOL_DOCUMENT_ROOT.'/includes/egulias/email-validator/EmailValidator/Validation/RFCValidation.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php'; + + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php'; + + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/InputByteStream.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signer.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php'; + require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php'; + //require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/classes/Swift/SignedMessage.php'; require_once DOL_DOCUMENT_ROOT.'/includes/swiftmailer/lib/swift_required.php'; // Create the message //$this->message = Swift_Message::newInstance(); $this->message = new Swift_Message(); - - // Adding a trackid header to a message + //$this->message = new Swift_SignedMessage(); + // Adding a trackid header to a message $headers = $this->message->getHeaders(); $headers->addTextHeader('X-Dolibarr-TRACKID', $trackid); $headerID = time() . '.swiftmailer-dolibarr-' . $trackid . '@' . $host; @@ -749,7 +756,16 @@ class CMailFile // Create the Mailer using your created Transport $this->mailer = new Swift_Mailer($this->transport); - if (! empty($conf->global->MAIN_MAIL_DEBUG)) { + // DKIM SIGN + if ($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED) { + $privateKey = $conf->global->MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY; + $domainName = $conf->global->MAIN_MAIL_EMAIL_DKIM_DOMAIN; + $selector = $conf->global->MAIN_MAIL_EMAIL_DKIM_SELECTOR; + $signer = new Swift_Signers_DKIMSigner($privateKey, $domainName, $selector); + $this->message->attachSigner($signer); + } + + if (! empty($conf->global->MAIN_MAIL_DEBUG)) { // To use the ArrayLogger $this->logger = new Swift_Plugins_Loggers_ArrayLogger(); // Or to use the Echo Logger diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/EmailLexer.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/EmailLexer.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailLexer.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/EmailParser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/EmailParser.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailParser.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/EmailValidator.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/EmailValidator.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/EmailValidator.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/AtextAfterCFWS.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/AtextAfterCFWS.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/AtextAfterCFWS.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/AtextAfterCFWS.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRLFAtTheEnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRLFAtTheEnd.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRLFAtTheEnd.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRLFAtTheEnd.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRLFX2.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRLFX2.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRLFX2.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRLFX2.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRNoLF.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRNoLF.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/CRNoLF.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CRNoLF.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/CharNotAllowed.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CharNotAllowed.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/CharNotAllowed.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CharNotAllowed.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/CommaInDomain.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CommaInDomain.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/CommaInDomain.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/CommaInDomain.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ConsecutiveAt.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ConsecutiveAt.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ConsecutiveAt.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ConsecutiveAt.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ConsecutiveDot.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ConsecutiveDot.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ConsecutiveDot.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ConsecutiveDot.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/DomainHyphened.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainHyphened.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/DomainHyphened.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DomainHyphened.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/DotAtEnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DotAtEnd.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/DotAtEnd.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DotAtEnd.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/DotAtStart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DotAtStart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/DotAtStart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/DotAtStart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingAT.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingAT.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingAT.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingAT.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingATEXT.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingATEXT.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingATEXT.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingATEXT.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingCTEXT.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingCTEXT.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingCTEXT.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingCTEXT.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingDTEXT.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingDTEXT.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingDTEXT.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingDTEXT.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingDomainLiteralClose.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingDomainLiteralClose.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingDomainLiteralClose.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingDomainLiteralClose.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/ExpectingQPair.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/InvalidEmail.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDNSRecord.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoDomainPart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoLocalPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoLocalPart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/NoLocalPart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/NoLocalPart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedComment.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnclosedQuotedString.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedQuotedString.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnclosedQuotedString.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnclosedQuotedString.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnopenedComment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnopenedComment.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Exception/UnopenedComment.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Exception/UnopenedComment.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Parser/DomainPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Parser/DomainPart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/DomainPart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Parser/LocalPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Parser/LocalPart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/LocalPart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Parser/Parser.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Parser/Parser.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Parser/Parser.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/DNSCheckValidation.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/EmailValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/EmailValidation.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/EmailValidation.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/Error/RFCWarnings.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Error/RFCWarnings.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/Error/RFCWarnings.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Error/RFCWarnings.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/Error/SpoofEmail.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Error/SpoofEmail.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/Error/SpoofEmail.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Error/SpoofEmail.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/Exception/EmptyValidationList.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleErrors.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/MultipleValidationWithAnd.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/NoRFCWarningsValidation.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/RFCValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/RFCValidation.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/RFCValidation.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Validation/SpoofCheckValidation.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/AddressLiteral.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/AddressLiteral.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/AddressLiteral.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/AddressLiteral.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/CFWSNearAt.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/CFWSNearAt.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/CFWSNearAt.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/CFWSNearAt.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/CFWSWithFWS.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/CFWSWithFWS.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/CFWSWithFWS.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/CFWSWithFWS.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/Comment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Comment.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/Comment.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Comment.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/DeprecatedComment.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DeprecatedComment.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/DeprecatedComment.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DeprecatedComment.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/DomainLiteral.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DomainLiteral.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/DomainLiteral.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DomainLiteral.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/DomainTooLong.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DomainTooLong.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/DomainTooLong.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/DomainTooLong.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/EmailTooLong.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/EmailTooLong.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/EmailTooLong.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/EmailTooLong.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6BadChar.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6BadChar.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6BadChar.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6BadChar.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6ColonEnd.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6ColonEnd.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6ColonEnd.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6ColonEnd.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6ColonStart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6ColonStart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6ColonStart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6ColonStart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6Deprecated.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6Deprecated.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6Deprecated.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6Deprecated.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6DoubleColon.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6DoubleColon.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6DoubleColon.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6DoubleColon.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6GroupCount.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6GroupCount.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6GroupCount.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6GroupCount.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6MaxGroups.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6MaxGroups.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/IPV6MaxGroups.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/IPV6MaxGroups.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/LabelTooLong.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LabelTooLong.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/LabelTooLong.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LabelTooLong.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/LocalTooLong.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/NoDNSMXRecord.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/NoDNSMXRecord.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/NoDNSMXRecord.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/NoDNSMXRecord.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/ObsoleteDTEXT.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/ObsoleteDTEXT.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/ObsoleteDTEXT.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/ObsoleteDTEXT.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/QuotedPart.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/QuotedPart.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedPart.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/QuotedString.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/QuotedString.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/QuotedString.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/TLD.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/TLD.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/TLD.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/TLD.php diff --git a/htdocs/includes/egulias/email-validator/EmailValidator/Warning/Warning.php b/htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php similarity index 100% rename from htdocs/includes/egulias/email-validator/EmailValidator/Warning/Warning.php rename to htdocs/includes/swiftmailer/egulias/email-validator/EmailValidator/Warning/Warning.php diff --git a/htdocs/includes/egulias/email-validator/LICENSE b/htdocs/includes/swiftmailer/egulias/email-validator/LICENSE similarity index 100% rename from htdocs/includes/egulias/email-validator/LICENSE rename to htdocs/includes/swiftmailer/egulias/email-validator/LICENSE diff --git a/htdocs/includes/egulias/email-validator/README.md b/htdocs/includes/swiftmailer/egulias/email-validator/README.md similarity index 100% rename from htdocs/includes/egulias/email-validator/README.md rename to htdocs/includes/swiftmailer/egulias/email-validator/README.md diff --git a/htdocs/includes/lexer/LICENSE b/htdocs/includes/swiftmailer/lexer/LICENSE similarity index 100% rename from htdocs/includes/lexer/LICENSE rename to htdocs/includes/swiftmailer/lexer/LICENSE diff --git a/htdocs/includes/lexer/README.md b/htdocs/includes/swiftmailer/lexer/README.md similarity index 100% rename from htdocs/includes/lexer/README.md rename to htdocs/includes/swiftmailer/lexer/README.md diff --git a/htdocs/includes/lexer/composer.json b/htdocs/includes/swiftmailer/lexer/composer.json similarity index 100% rename from htdocs/includes/lexer/composer.json rename to htdocs/includes/swiftmailer/lexer/composer.json diff --git a/htdocs/includes/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php similarity index 100% rename from htdocs/includes/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php rename to htdocs/includes/swiftmailer/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 0953014aa91..29c5381af80 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -277,6 +277,10 @@ MAIN_MAIL_SMTPS_ID=Identifiant d'authentification SMTP si authentification SMTP MAIN_MAIL_SMTPS_PW=Mot de passe d'authentification SMTP si authentification SMTP requise MAIN_MAIL_EMAIL_TLS= Utilisation du chiffrement TLS (SSL) MAIN_MAIL_EMAIL_STARTTLS= Utiliser le cryptage TTS (STARTTLS) +MAIN_MAIL_EMAIL_DKIM_ENABLED= Utiliser la signature DKIM +MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domaine DKIM +MAIN_MAIL_EMAIL_DKIM_SELECTOR=Sélecteur de clé DKIM +MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Clé privée RSA DKIM MAIN_DISABLE_ALL_SMS=Désactiver globalement tout envoi de SMS (pour mode test ou démos) MAIN_SMS_SENDMODE=Méthode d'envoi des SMS MAIN_MAIL_SMS_FROM=Numéro de téléphone par défaut pour l'envoi des SMS