diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php index 8f797ea25e5..44fffd6a7cc 100644 --- a/htdocs/admin/mails.php +++ b/htdocs/admin/mails.php @@ -156,6 +156,7 @@ if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'testhtml') { $form = new Form($db); +// Set default variables $linuxlike = 1; if (preg_match('/^win/i', PHP_OS)) { $linuxlike = 0; @@ -167,11 +168,12 @@ if (preg_match('/^mac/i', PHP_OS)) { if (!getDolGlobalString('MAIN_MAIL_SENDMODE')) { $conf->global->MAIN_MAIL_SENDMODE = 'mail'; } -$port = getDolGlobalString('MAIN_MAIL_SMTP_PORT') ? $conf->global->MAIN_MAIL_SMTP_PORT : ini_get('smtp_port'); + +$port = getDolGlobalInt('MAIN_MAIL_SMTP_PORT', ini_get('smtp_port')); if (!$port) { $port = 25; } -$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER') ? $conf->global->MAIN_MAIL_SMTP_SERVER : ini_get('SMTP'); +$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER', ini_get('SMTP')); if (!$server) { $server = '127.0.0.1'; } @@ -310,15 +312,22 @@ if ($action == 'edit') { } function change_smtp_auth_method() { console.log("Call smtp auth method"); - if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if(jQuery("#MAIN_MAIL_SENDMODE").val()==\'mail\'){ - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").hide(); + if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } + } else if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } } else { jQuery(".smtp_pw").show(); jQuery(".smtp_oauth_service").hide(); @@ -599,34 +608,20 @@ if ($action == 'edit') { print ''; - print ''; - - // Disable - print ''; + print ''; // Force e-mail recipient print ''; - print '
'.$langs->trans("ParametersForTestEnvironment").'
'.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; - print $form->selectyesno('MAIN_DISABLE_ALL_MAILS', getDolGlobalString('MAIN_DISABLE_ALL_MAILS'), 1); - print '
'.$langs->trans("OtherOptions").'
'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").''; - print ''; + print ''; print '
'; - - - print '
'; - - - print ''; - print ''; - // From $help = $form->textwithpicto('', $langs->trans("EMailHelpMsgSPFDKIM")); print ''; - print ''; // Default from type @@ -668,7 +663,21 @@ if ($action == 'edit') { print dol_get_fiche_head($head, 'common', '', -1); print ''.$langs->trans("EMailsDesc")."
\n"; - print "

\n"; + print "
\n"; + + print $langs->trans("MAIN_DISABLE_ALL_MAILS"); + if (!empty($conf->use_javascript_ajax)) { + print ajax_constantonoff('MAIN_DISABLE_ALL_MAILS', array(), null, 0, 0, 1, 2, 0, 0, '_red').''; + } else { + print yn(getDolGlobalString('MAIN_DISABLE_ALL_MAILS')); + if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { + print img_warning($langs->trans("Disabled")); + } + } + + print "
\n"; + print "
\n"; + print "
\n"; if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { @@ -837,24 +846,12 @@ if ($action == 'edit') { print '
'; } - - print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table - print '
'.$langs->trans("OtherOptions").'
'; print $langs->trans("MAIN_MAIL_EMAIL_FROM", ini_get('sendmail_from') ? ini_get('sendmail_from') : $langs->transnoentities("Undefined")); print ' '.$help; print '
'; - print ''; - - // Disable - print ''; - + /* if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + print '
'.$langs->trans("ParametersForTestEnvironment").'
'.$langs->trans("MAIN_DISABLE_ALL_MAILS").''; - if (!empty($conf->use_javascript_ajax)) { - print ajax_constantonoff('MAIN_DISABLE_ALL_MAILS', array(), null, 0, 0, 1, 2, 0, 0, '_red').''; - } else { - print yn(getDolGlobalString('MAIN_DISABLE_ALL_MAILS')); - if (getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { - print img_warning($langs->trans("Disabled")); - } - } - print '
'; + print ''; + // Force e-mail recipient print ''; + + print '
'.$langs->trans("ParametersForTestEnvironment").'
'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").''.getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'); if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) { @@ -865,19 +862,32 @@ if ($action == 'edit') { } } print '
'; + print ''; + + print '
'; } - - print ''; - print ''; - - - print '
'; + */ print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table print ''; print ''; + // Force e-mail recipient + if (!getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { + print ''; + } + // From $help = $form->textwithpicto('', $langs->trans("EMailHelpMsgSPFDKIM")); print ''; + print ''; } // TLS diff --git a/htdocs/admin/mails_passwordreset.php b/htdocs/admin/mails_passwordreset.php new file mode 100644 index 00000000000..3316f278944 --- /dev/null +++ b/htdocs/admin/mails_passwordreset.php @@ -0,0 +1,804 @@ + + * Copyright (C) 2009-2012 Regis Houssin + * Copyright (C) 2013 Juanjo Menent + * Copyright (C) 2016 Jonathan TISSEAU + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/** + * \file htdocs/admin/mails_passwordreset.php + * \brief Page to setup mails for password reset + */ + +// Load Dolibarr environment +require '../main.inc.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; + +// Load translation files required by the page +$langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors')); + +$action = GETPOST('action', 'aZ09'); +$cancel = GETPOST('cancel', 'aZ09'); + +$usersignature = $user->signature; +// For action = test or send, we ensure that content is not html, even for signature, because this we want a test with NO html. +if ($action == 'test' || $action == 'send') { + $usersignature = dol_string_nohtmltag($usersignature, 2); +} + +$substitutionarrayfortest = array( + '__ID__' => 'TESTIdRecord', + '__USER_LOGIN__' => $user->login, + '__USER_EMAIL__' => $user->email, + '__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails + '__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails + '__LASTNAME__' => 'RecipientLastname', + '__FIRSTNAME__' => 'RecipientFirstname', + '__ADDRESS__'=> 'RecipientAddress', + '__ZIP__'=> 'RecipientZip', + '__TOWN_'=> 'RecipientTown', + '__COUNTRY__'=> 'RecipientCountry', + '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT, +); +complete_substitutions_array($substitutionarrayfortest, $langs); + +// List of sending methods +$listofmethods = array(); +$listofmethods['default'] = $langs->trans('DefaultOutgoingEmailSetup'); +$listofmethods['mail'] = 'PHP mail function'; +//$listofmethods['simplemail']='Simplemail class'; +$listofmethods['smtps'] = 'SMTP/SMTPS socket library'; +if (version_compare(phpversion(), '7.0', '>=')) { + $listofmethods['swiftmailer'] = 'Swift Mailer socket library'; +} + +// Security check +if (!$user->admin) { + accessforbidden(); +} + + +/* + * Actions + */ + +if ($action == 'update' && !$cancel) { + // Send mode parameters + dolibarr_set_const($db, "MAIN_MAIL_SENDMODE_PASSWORDRESET", GETPOST("MAIN_MAIL_SENDMODE_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTP_PORT_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTP_SERVER_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTPS_ID_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW_PASSWORDRESET")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTPS_PW_PASSWORDRESET", 'none'), 'chaine', 0, '', $conf->entity); + } + if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET", 'alphanohtml'), 'chaine', 0, '', $conf->entity); + } + if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET")) { + dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET", 'alphanohtml'), 'chaine', 0, '', $conf->entity); + } + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS_PASSWORDRESET", GETPOST("MAIN_MAIL_EMAIL_TLS_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET", GETPOST("MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET"), 'chaine', 0, '', $conf->entity); + + header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup"); + exit; +} + + +// Actions to send emails +$id = 0; +$actiontypecode = ''; // Not an event for agenda +$triggersendname = ''; // Disable triggers +$paramname = 'id'; +$mode = 'emailfortest'; +$trackid = (($action == 'testhtml') ? "testhtml" : "test"); +$sendcontext = 'ticket'; // Force to use dedicated context of setup for ticket +include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php'; + +if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'test') { + $action = 'test'; +} +if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'testhtml') { + $action = 'testhtml'; +} + + + + +/* + * View + */ + +$form = new Form($db); + +$linuxlike = 1; +if (preg_match('/^win/i', PHP_OS)) { + $linuxlike = 0; +} +if (preg_match('/^mac/i', PHP_OS)) { + $linuxlike = 0; +} + +if (!getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET')) { + $conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET = 'default'; +} +$port = getDolGlobalInt('MAIN_MAIL_SMTP_PORT_PASSWORDRESET', ini_get('smtp_port')); +if (!$port) { + $port = 25; +} +$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER_PASSWORDRESET', ini_get('SMTP')); +if (!$server) { + $server = '127.0.0.1'; +} + + +$wikihelp = 'EN:Setup_EMails|FR:Paramétrage_EMails|ES:Configuración_EMails'; +llxHeader('', $langs->trans("Setup"), $wikihelp, '', 0, 0, '', '', '', 'mod-admin page-mails_passwordreset'); + +print load_fiche_titre($langs->trans("EMailsSetup"), '', 'title_setup'); + +$head = email_admin_prepare_head(); + +// List of oauth services +$oauthservices = array(); + +foreach ($conf->global as $key => $val) { + if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) { + $key = preg_replace('/^OAUTH_/', '', $key); + $key = preg_replace('/_ID$/', '', $key); + if (preg_match('/^.*-/', $key)) { + $name = preg_replace('/^.*-/', '', $key); + } else { + $name = $langs->trans("NoName"); + } + $provider = preg_replace('/-.*$/', '', $key); + $provider = ucfirst(strtolower($provider)); + + $oauthservices[$key] = $name." (".$provider.")"; + } +} + + +if ($action == 'edit') { + if ($conf->use_javascript_ajax) { + print "\n".''."\n"; + } + + print '
'; + print ''; + print ''; + + print dol_get_fiche_head($head, 'common_passwordreset', '', -1); + + print ''.$langs->trans("EMailsDesc")."
\n"; + print "

\n"; + + + clearstatcache(); + + print '
'.$langs->trans("OtherOptions").'
'.$langs->trans("MAIN_MAIL_FORCE_SENDTO").''.getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'); + if (getDolGlobalString('MAIN_MAIL_FORCE_SENDTO')) { + if (!isValidEmail(getDolGlobalString('MAIN_MAIL_FORCE_SENDTO'))) { + print img_warning($langs->trans("ErrorBadEMail")); + } else { + print img_warning($langs->trans("RecipientEmailsWillBeReplacedWithThisValue")); + } + } + print '
'; @@ -997,7 +1007,6 @@ if ($action == 'edit') { print ''; - if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail' && !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) { /* // Warning 1 @@ -1013,7 +1022,7 @@ if ($action == 'edit') { print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA")); } - if (!in_array($action, array('testconnect', 'test', 'testhtml'))) { + if (!in_array($action, array('testconnect', 'test', 'testhtml')) && !getDolGlobalString('MAIN_DISABLE_ALL_MAILS')) { $text = ''; if (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail') { //$text .= $langs->trans("WarningPHPMail"); // To encourage to use SMTPS @@ -1132,8 +1141,10 @@ if ($action == 'edit') { $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test")); $formmail->withtopicreadonly = 0; $formmail->withfile = 2; - $formmail->withlayout = 1; // Not MAIN_EMAIL_USE_LAYOUT must be set - $formmail->withaiprompt = ($action == 'testhtml' ? 'html' : 'text'); + + $formmail->withlayout = 1; // Note: MAIN_EMAIL_USE_LAYOUT must be set + $formmail->withaiprompt = ($action == 'testhtml' ? 'html' : 'text'); // Note: Module AI must be enabled + $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); $formmail->withbodyreadonly = 0; $formmail->withcancel = 1; diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php index e25dc10f210..024d07537aa 100644 --- a/htdocs/admin/mails_emailing.php +++ b/htdocs/admin/mails_emailing.php @@ -41,20 +41,20 @@ if ($action == 'test' || $action == 'send') { } $substitutionarrayfortest = array( - '__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT, - '__CHECK_READ__' => '', + '__ID__' => 'RecipientIdRecord', '__USER_LOGIN__' => $user->login, '__USER_EMAIL__' => $user->email, '__USER_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails '__SENDEREMAIL_SIGNATURE__' => (($user->signature && !getDolGlobalString('MAIN_MAIL_DO_NOT_USE_SIGN')) ? $usersignature : ''), // Done into actions_sendmails - '__ID__' => 'RecipientIdRecord', //'__EMAIL__' => 'RecipientEMail', // Done into actions_sendmails '__LASTNAME__' => 'RecipientLastname', '__FIRSTNAME__' => 'RecipientFirstname', '__ADDRESS__'=> 'RecipientAddress', '__ZIP__'=> 'RecipientZip', '__TOWN_'=> 'RecipientTown', - '__COUNTRY__'=> 'RecipientCountry' + '__COUNTRY__'=> 'RecipientCountry', + '__DOL_MAIN_URL_ROOT__' => DOL_MAIN_URL_ROOT, + '__CHECK_READ__' => '' ); complete_substitutions_array($substitutionarrayfortest, $langs); @@ -139,11 +139,11 @@ if (preg_match('/^mac/i', PHP_OS)) { if (!getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING')) { $conf->global->MAIN_MAIL_SENDMODE_EMAILING = 'default'; } -$port = getDolGlobalString('MAIN_MAIL_SMTP_PORT_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : ini_get('smtp_port'); +$port = getDolGlobalInt('MAIN_MAIL_SMTP_PORT_EMAILING', ini_get('smtp_port')); if (!$port) { $port = 25; } -$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING') ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : ini_get('SMTP'); +$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER_EMAILING', ini_get('SMTP')); if (!$server) { $server = '127.0.0.1'; } @@ -200,7 +200,13 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").prop("disabled", true); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(0); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").prop("disabled", true); - jQuery(".smtp_method").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_EMAILING").prop("disabled", true); + jQuery(".smtp_method").hide(); + jQuery(".dkim").hide(); jQuery(".smtp_auth_method").hide(); '; if ($linuxlike) { @@ -230,6 +236,14 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING').'); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_EMAILING").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_EMAILING").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_EMAILING").hide(); jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").show(); @@ -237,6 +251,7 @@ if ($action == 'edit') { jQuery("#smtp_port_mess").hide(); jQuery("#smtp_server_mess").hide(); jQuery(".smtp_method").show(); + jQuery(".dkim").hide(); jQuery(".smtp_auth_method").show(); } if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'swiftmailer\') @@ -249,6 +264,14 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_STARTTLS_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING').'); jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_EMAILING").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_EMAILING").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_EMAILING").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_EMAILING").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_EMAILING").hide(); jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT_EMAILING").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER_EMAILING").show(); @@ -256,22 +279,30 @@ if ($action == 'edit') { jQuery("#smtp_server_mess").hide(); jQuery("#smtp_port_mess").hide(); jQuery(".smtp_method").show(); + jQuery(".dkim").show(); jQuery(".smtp_auth_method").show(); } } function change_smtp_auth_method() { console.log("Call smtp auth method"); - if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if(jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'mail\'){ - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").hide(); + if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'smtps\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } + } else if (jQuery("#MAIN_MAIL_SENDMODE_EMAILING").val()==\'swiftmailer\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } } else { - jQuery(".smtp_pw").show(); + jQuery(".smtp_pw").hide(); jQuery(".smtp_oauth_service").hide(); } } @@ -593,7 +624,7 @@ if ($action == 'edit') { if (empty($text)) { $text = $langs->trans("Undefined").img_warning(); } - print '
'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE_EMAILING").''.$text.'
'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''.$text.'
'; + print ''; + + // Method + + print ''; + + // Host server + + print ''; + if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail') { + print ''; + } else { + print ''; + } + print ''; + + // Port + + print ''; + + // AUTH method + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + print ''; + } + + // ID + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + $mainstmpid = (getDolGlobalString('MAIN_MAIL_SMTPS_ID_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTPS_ID_PASSWORDRESET : ''); + print ''; + } + + // PW + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + $mainsmtppw = (getDolGlobalString('MAIN_MAIL_SMTPS_PW_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTPS_PW_PASSWORDRESET : ''); + print ''; + } + + // OAUTH service provider + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + print ''; + } + + // TLS + + print ''; + + // STARTTLS + + print ''; + + // SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET + print ''; + + print '
'.$langs->trans("Parameters").'
'.$langs->trans("MAIN_MAIL_SENDMODE").''; + + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print $form->selectarray('MAIN_MAIL_SENDMODE_PASSWORDRESET', $listofmethods, $conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET); + } else { + $text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET')]; + if (empty($text)) { + $text = $langs->trans("Undefined"); + } + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + print '
'; + print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); + print ''; + print ''.$langs->trans("SeeLocalSendMailSetup").''; + print ''; + $mainserver = (getDolGlobalString('MAIN_MAIL_SMTP_SERVER_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_PASSWORDRESET : ''); + $smtpserver = ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined"); + if ($linuxlike) { + print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike"); + } else { + print $langs->trans("MAIN_MAIL_SMTP_SERVER", $smtpserver); + } + print ''; + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print ''; + print ''; + print ''.$langs->trans("SeeLocalSendMailSetup").''; + print ' ' . $langs->trans("SeeLinkToOnlineDocumentation") . ''; + } else { + $text = !empty($mainserver) ? $mainserver : $smtpserver; + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + print '
'; + if (!$conf->use_javascript_ajax && $linuxlike && getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail') { + print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike"); + print ''; + print ''.$langs->trans("SeeLocalSendMailSetup").''; + } else { + $mainport = (getDolGlobalString('MAIN_MAIL_SMTP_PORT_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTP_PORT_PASSWORDRESET : ''); + $smtpport = ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined"); + if ($linuxlike) { + print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike"); + } else { + print $langs->trans("MAIN_MAIL_SMTP_PORT", $smtpport); + } + print ''; + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print ''; + print ''; + print ''.$langs->trans("SeeLocalSendMailSetup").''; + } else { + $text = (!empty($mainport) ? $mainport : $smtpport); + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + } + print '
'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''; + $vartosmtpstype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET'; + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + // Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case) + print ' '; + print ''; + print '
'; + print ' '; + print ''; + print '
'; + print ' '; + print ''; + if (!isModEnabled('oauth')) { + print '   '.$langs->trans("EnableModuleX", "OAuth").''; + } else { + print '   '.$langs->trans("SetupModuleX", " OAuth").''; + } + } else { + $value = getDolGlobalString($vartosmtpstype, 'LOGIN'); + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin'); + print ''; + } + print '
'.$langs->trans("MAIN_MAIL_SMTPS_ID").''; + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print ''; + } else { + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_ID_PASSWORDRESET, $htmltext, 1, 'superadmin'); + print ''; + } + print '
'.$langs->trans("MAIN_MAIL_SMTPS_PW").''; + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print ''; + } else { + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($conf->global->MAIN_MAIL_SMTPS_PW_PASSWORDRESET, $htmltext, 1, 'superadmin'); + print ''; + } + print '
'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''; + // SuperAdministrator access only + if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { + print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET); + } else { + $text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET')]; + if (empty($text)) { + $text = $langs->trans("Undefined"); + } + $htmltext = $langs->trans("ContactSuperAdminForChange"); + print $form->textwithpicto($text, $htmltext, 1, 'superadmin'); + print ''; + } + print '
'.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + if (function_exists('openssl_open')) { + print $form->selectyesno('MAIN_MAIL_EMAIL_TLS_PASSWORDRESET', (getDolGlobalString('MAIN_MAIL_EMAIL_TLS_PASSWORDRESET') ? $conf->global->MAIN_MAIL_EMAIL_TLS_PASSWORDRESET : 0), 1); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + if (function_exists('openssl_open')) { + print $form->selectyesno('MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET', (getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET') ? $conf->global->MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET : 0), 1); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").''; + if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')))) { + if (function_exists('openssl_open')) { + print $form->selectyesno('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET', (getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET') ? $conf->global->MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET : 0), 1); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'; + + print dol_get_fiche_end(); + + print $form->buttonsSaveCancel(); + + print ''; +} else { + print dol_get_fiche_head($head, 'common_passwordreset', '', -1); + + print ''.$langs->trans("EMailsDesc")."
\n"; + print "

\n"; + + print '
'; // You can use div-table-responsive-no-min if you don't need reserved height for your table + print ''; + print ''; + + // Method + print ''; + + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') && getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') != 'default') { + // Host server + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail')) { + //print ''; + } else { + print ''; + } + + // Port + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail')) { + //print ''; + } else { + print ''; + } + + // AUTH method + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET'), array('smtps', 'swiftmailer'))) { + $authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET', 'LOGIN'); + $text = ''; + if ($authtype === "LOGIN") { + $text = $langs->trans("UseAUTHLOGIN"); + } elseif ($authtype === "PLAIN") { + $text = $langs->trans("UseAUTHPLAIN"); + } elseif ($authtype === "XOAUTH2") { + $text = $langs->trans("UseOauth"); + } + print ''; + } + + // SMTPS ID + if (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer'))) { + print ''; + } + + // SMTPS PW + if (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET') != "XOAUTH2") { + print ''; + } + + // SMTPS oauth service + if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE_PASSWORDRESET') === "XOAUTH2") { + $text = $oauthservices[getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE_PASSWORDRESET')]; + if (empty($text)) { + $text = $langs->trans("Undefined").img_warning(); + } + print ''; + } + + // TLS + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) { + // Nothing + } else { + print ''; + } + + // STARTTLS + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) { + // Nothing + } else { + print ''; + } + + // SMTP_ALLOW_SELF_SIGNED_EMAILING + if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE', 'mail') == 'mail')) { + // Nothing + } else { + print ''; + } + } + + print '
'.$langs->trans("Parameters").'
'.$langs->trans("MAIN_MAIL_SENDMODE").''; + $text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET')]; + if (empty($text)) { + $text = $langs->trans("Undefined").img_warning(); + } + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'default') { + print ''.$text.''; + } else { + print $text; + } + print '
'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").'
'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ? ini_get('SMTP') : $langs->transnoentities("Undefined")).''.(getDolGlobalString('MAIN_MAIL_SMTP_SERVER_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_PASSWORDRESET : '').'
'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").''.$langs->trans("SeeLocalSendMailSetup").'
'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ? ini_get('smtp_port') : $langs->transnoentities("Undefined")).''.(getDolGlobalString('MAIN_MAIL_SMTP_PORT_PASSWORDRESET') ? $conf->global->MAIN_MAIL_SMTP_PORT_PASSWORDRESET : '').'
'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''.$text.'
'.$langs->trans("MAIN_MAIL_SMTPS_ID").'' . getDolGlobalString('MAIN_MAIL_SMTPS_ID_PASSWORDRESET').'
'.$langs->trans("MAIN_MAIL_SMTPS_PW").''.preg_replace('/./', '*', getDolGlobalString('MAIN_MAIL_SMTPS_PW_PASSWORDRESET')).'
'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''.$text.'
'.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; + if (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer'))) { + if (function_exists('openssl_open')) { + print yn(getDolGlobalString('MAIN_MAIL_EMAIL_TLS_PASSWORDRESET')); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print ''.yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").''; + if (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer'))) { + if (function_exists('openssl_open')) { + print yn(getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_PASSWORDRESET')); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print ''.yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'.$langs->trans("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED").''; + if (isset($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET) && in_array($conf->global->MAIN_MAIL_SENDMODE_PASSWORDRESET, array('smtps', 'swiftmailer'))) { + if (function_exists('openssl_open')) { + print yn(getDolGlobalInt('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_PASSWORDRESET')); + } else { + print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')'; + } + } else { + print ''.yn(0).' ('.$langs->trans("NotSupported").')'; + } + print '
'; + print '
'; + + print dol_get_fiche_end(); + + + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail' && !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA')) { + print '
'; + /* + // Warning 1 + if ($linuxlike) + { + $sendmailoption=ini_get('mail.force_extra_parameters'); + if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption)) + { + print info_admin($langs->trans("SendmailOptionNotComplete")); + } + }*/ + // Warning 2 + print info_admin($langs->trans("SendmailOptionMayHurtBuggedMTA")); + } + + + // Buttons for actions + + print '
'; + + print ''.$langs->trans("Modify").''; + + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') && getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') != 'default') { + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') != 'mail' || !$linuxlike) { + if (function_exists('fsockopen') && $port && $server) { + print ''.$langs->trans("DoTestServerAvailability").''; + } + } else { + print ''.$langs->trans("DoTestServerAvailability").''; + } + + print ''.$langs->trans("DoTestSend").''; + + if (isModEnabled('fckeditor')) { + print ''.$langs->trans("DoTestSendHTML").''; + } + } + + print '
'; + + + if (getDolGlobalString('MAIN_MAIL_SENDMODE_PASSWORDRESET') == 'mail' && !in_array($action, array('testconnect', 'test', 'testhtml'))) { + $text = $langs->trans("WarningPHPMail"); + print info_admin($text); + } + + // Run the test to connect + if ($action == 'testconnect') { + print '
'; + print load_fiche_titre($langs->trans("DoTestServerAvailability")); + + include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php'; + $mail = new CMailFile('', '', '', '', array(), array(), array(), '', '', 0, '', '', '', '', $trackid, $sendcontext); + + $result = $mail->check_server_port($server, $port); + if ($result) { + print '
'.$langs->trans("ServerAvailableOnIPOrPort", $server, $port).'
'; + } else { + $errormsg = $langs->trans("ServerNotAvailableOnIPOrPort", $server, $port); + + if ($mail->error) { + $errormsg .= ' - '.$mail->error; + } + + setEventMessages($errormsg, null, 'errors'); + } + print '
'; + } + + // Show email send test form + if ($action == 'test' || $action == 'testhtml') { + print '
'; + print load_fiche_titre($action == 'testhtml' ? $langs->trans("DoTestSendHTML") : $langs->trans("DoTestSend")); + + print dol_get_fiche_head(array(), '', '', -1); + + // Cree l'objet formulaire mail + include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php'; + $formmail = new FormMail($db); + $formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname', 'restricthtml') : getDolGlobalString('MAIN_MAIL_EMAIL_FROM')); + $formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail', 'restricthtml') : getDolGlobalString('MAIN_MAIL_EMAIL_FROM')); + $formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test"); + $formmail->fromid = $user->id; + $formmail->fromalsorobot = 1; + $formmail->withfromreadonly = 0; + $formmail->withsubstit = 0; + $formmail->withfrom = 1; + $formmail->witherrorsto = 1; + $formmail->withto = (GETPOSTISSET('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1)); + $formmail->withtocc = (GETPOSTISSET('sendtocc') ? GETPOST('sendtocc', 'restricthtml') : 1); + $formmail->withtoccc = (GETPOSTISSET('sendtoccc') ? GETPOST('sendtoccc', 'restricthtml') : 1); + $formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test")); + $formmail->withtopicreadonly = 0; + $formmail->withfile = 2; + $formmail->withbody = (GETPOSTISSET('message') ? GETPOST('message', 'restricthtml') : ($action == 'testhtml' ? $langs->transnoentities("PredefinedMailTestHtml") : $langs->transnoentities("PredefinedMailTest"))); + $formmail->withbodyreadonly = 0; + $formmail->withcancel = 1; + $formmail->withdeliveryreceipt = 1; + $formmail->withfckeditor = ($action == 'testhtml' ? 1 : 0); + $formmail->ckeditortoolbar = 'dolibarr_mailings'; + // Tableau des substitutions + $formmail->substit = $substitutionarrayfortest; + // Tableau des parameters complementaires du post + $formmail->param["action"] = "send"; + $formmail->param["models"] = "body"; + $formmail->param["mailid"] = 0; + $formmail->param["returnurl"] = $_SERVER["PHP_SELF"]; + + // Init list of files + if (GETPOST("mode", "aZ09") == 'init') { + $formmail->clear_attached_files(); + } + + print $formmail->get_form('addfile', 'removefile'); + + print dol_get_fiche_end(); + } +} + +// End of page +llxFooter(); +$db->close(); diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php index 99f7c1f6b82..7bdb3a6af6d 100644 --- a/htdocs/admin/mails_ticket.php +++ b/htdocs/admin/mails_ticket.php @@ -137,11 +137,11 @@ if (preg_match('/^mac/i', PHP_OS)) { if (!getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET')) { $conf->global->MAIN_MAIL_SENDMODE_TICKET = 'default'; } -$port = getDolGlobalString('MAIN_MAIL_SMTP_PORT_TICKET') ? $conf->global->MAIN_MAIL_SMTP_PORT_TICKET : ini_get('smtp_port'); +$port = getDolGlobalInt('MAIN_MAIL_SMTP_PORT_TICKET', ini_get('smtp_port')); if (!$port) { $port = 25; } -$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER_TICKET') ? $conf->global->MAIN_MAIL_SMTP_SERVER_TICKET : ini_get('SMTP'); +$server = getDolGlobalString('MAIN_MAIL_SMTP_SERVER_TICKET', ini_get('SMTP')); if (!$server) { $server = '127.0.0.1'; } @@ -197,7 +197,15 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").prop("disabled", true); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(0); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").prop("disabled", true); - jQuery(".smtp_method").hide(); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").val(0); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_TICKET").prop("disabled", true); + jQuery(".smtp_method").hide(); + jQuery(".dkim").hide(); jQuery(".smtp_auth_method").hide(); '; if ($linuxlike) { @@ -225,13 +233,24 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_TICKET').'); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET').'); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_TICKET").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_TICKET").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_TICKET").hide(); jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").show(); jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show(); jQuery("#smtp_server_mess").hide(); - jQuery("#smtp_port_mess").hide(); - jQuery(".smtp_method").show(); + jQuery("#smtp_port_mess").hide(); + jQuery(".smtp_method").show(); + jQuery(".dkim").hide(); jQuery(".smtp_auth_method").show(); } if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\') @@ -242,29 +261,47 @@ if ($action == 'edit') { jQuery("#MAIN_MAIL_EMAIL_TLS_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_STARTTLS_TICKET').'); jQuery("#MAIN_MAIL_EMAIL_STARTTLS_TICKET").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").val(' . getDolGlobalString('MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET').'); + jQuery("#MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED_TICKET").removeAttr("disabled"); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").val(0); + jQuery("#MAIN_MAIL_EMAIL_DKIM_ENABLED_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_TICKET").prop("disabled", true); + jQuery("#MAIN_MAIL_EMAIL_DKIM_DOMAIN_TICKET").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_SELECTOR_TICKET").hide(); + jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY_TICKET").hide(); jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").removeAttr("disabled"); jQuery("#MAIN_MAIL_SMTP_SERVER_TICKET").show(); jQuery("#MAIN_MAIL_SMTP_PORT_TICKET").show(); jQuery("#smtp_server_mess").hide(); jQuery("#smtp_port_mess").hide(); - jQuery(".smtp_method").show(); - jQuery(".smtp_auth_method").show(); + jQuery(".smtp_method").show(); + jQuery(".dkim").show(); + jQuery(".smtp_auth_method").show(); } } function change_smtp_auth_method() { - console.log("Call smtp auth method"); - if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) { - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").show(); - } else if(jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'mail\'){ - jQuery(".smtp_pw").hide(); - jQuery(".smtp_oauth_service").hide(); + console.log("Call smtp auth method "+jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()); + if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'smtps\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } + } else if (jQuery("#MAIN_MAIL_SENDMODE_TICKET").val()==\'swiftmailer\') { + if (jQuery("#radio_oauth").prop("checked")) { + jQuery(".smtp_pw").hide(); + jQuery(".smtp_oauth_service").show(); + } else { + jQuery(".smtp_pw").show(); + jQuery(".smtp_oauth_service").hide(); + } } else { - jQuery(".smtp_pw").show(); + jQuery(".smtp_pw").hide(); jQuery(".smtp_oauth_service").hide(); } } @@ -391,7 +428,7 @@ if ($action == 'edit') { // AUTH method if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) { - print ''.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").''; $vartosmtpstype = 'MAIN_MAIL_SMTPS_AUTH_TYPE_TICKET'; if (!isModEnabled('multicompany') || ($user->admin && !$user->entity)) { // Note: Default value for MAIN_MAIL_SMTPS_AUTH_TYPE if not defined is 'LOGIN' (but login/pass may be empty and they won't be provided in such a case) @@ -466,7 +503,6 @@ if ($action == 'edit') { } // TLS - print ''.$langs->trans("MAIN_MAIL_EMAIL_TLS").''; if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) { if (function_exists('openssl_open')) { @@ -480,7 +516,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_TICKET) && in_array($conf->global->MAIN_MAIL_SENDMODE_TICKET, array('smtps', 'swiftmailer')))) { if (function_exists('openssl_open')) { @@ -581,7 +616,7 @@ if ($action == 'edit') { if (empty($text)) { $text = $langs->trans("Undefined").img_warning(); } - print ''.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE_TICKET").''.$text.''; + print ''.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").''.$text.''; } // TLS @@ -646,8 +681,7 @@ if ($action == 'edit') { print '
'; /* // Warning 1 - if ($linuxlike) - { + if ($linuxlike) { $sendmailoption=ini_get('mail.force_extra_parameters'); if (empty($sendmailoption) || ! preg_match('/ba/',$sendmailoption)) { diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php index e3dbad0487e..5b5d443b872 100644 --- a/htdocs/core/lib/admin.lib.php +++ b/htdocs/core/lib/admin.lib.php @@ -2092,9 +2092,16 @@ function email_admin_prepare_head() $head[$h][2] = 'common_ticket'; $h++; } + + if (getDolGlobalString('MAIN_MAIL_ALLOW_CUSTOM_SENDING_METHOD_FOR_PASSWORD_RESET')) { + $head[$h][0] = DOL_URL_ROOT."/admin/mails_passwordreset.php"; + $head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("PasswordReset")); + $head[$h][2] = 'common_passwordreset'; + $h++; + } } - // admin and non admin can view this menu entry, but it is not shown yet when we on user menu "Email templates" + // Admin and non admin can view this menu entry, but it is not shown yet when we on user menu "Email templates" if (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates') { $head[$h][0] = DOL_URL_ROOT."/admin/mails_senderprofile_list.php"; $head[$h][1] = $langs->trans("EmailSenderProfiles"); diff --git a/htdocs/core/tpl/formlayoutai.tpl.php b/htdocs/core/tpl/formlayoutai.tpl.php index 4bf63094bfa..8cf9f934d32 100644 --- a/htdocs/core/tpl/formlayoutai.tpl.php +++ b/htdocs/core/tpl/formlayoutai.tpl.php @@ -92,9 +92,13 @@ if ($showlinktolayout) { } else { $out .= $formmail->getModelEmailTemplate($htmlname); } +} else { + $out .= ''; } if ($showlinktoai) { $out .= $formmail->getSectionForAIPrompt($showlinktoai, $formmail->withaiprompt, $htmlname); +} else { + $out .= ''; } ?> diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang index 7bee7f74343..1e82b31a5d1 100644 --- a/htdocs/langs/en_US/mails.lang +++ b/htdocs/langs/en_US/mails.lang @@ -174,7 +174,7 @@ NoContactWithCategoryFound=No category found linked to some contacts/addresses NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties OutGoingEmailSetup=Outgoing emails InGoingEmailSetup=Incoming emails -OutGoingEmailSetupForEmailing=Outgoing emails (for module %s) +OutGoingEmailSetupForEmailing=Outgoing emails (%s) DefaultOutgoingEmailSetup=Same configuration than the global Outgoing email setup Information=Information ContactsWithThirdpartyFilter=Contacts with third-party filter @@ -196,4 +196,5 @@ ModelTemplate=Email template YouCanChooseAModelForYouMailContent= You can choose one of template models or generate one with AI TitleOfMailHolder=Title of the e-mail goes here ContentOfMailHolder=Content of email goes here... -LastNews=Last News \ No newline at end of file +LastNews=Last News +PasswordReset=Password reset