WMDE
/
LDAPAccountManager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

new mail system

This commit is contained in:
Roland Gruber 2020-03-11 21:27:36 +01:00
parent 2904f178a0
commit 012e2b450f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lam/docs/manual-sources/chapter-configuration.xml
View File

@ -247,7 +247,8 @@
<para>SMTP setup:</para> <para>SMTP setup:</para>
<para>Mail server: enter name + port separated by ":". E.g. "server:25" <para>Mail server: enter name + port separated by ":". E.g. "server:25"
will use "server" on port 25.</para> will use "server" on port 25. Please note that your mail server
<emphasis role="bold">must</emphasis> support TLS encryption.</para>
<para>User name: enter the user name if your SMTP server requires <para>User name: enter the user name if your SMTP server requires
authentication</para> authentication</para>

2
lam/help/help.inc
View File

@ -382,7 +382,7 @@ $helpArray = array (
// jobs // jobs
'800' => array( '800' => array(
"Headline" => _('From address'), "Headline" => _('From address'),
"Text" => _('This email address will be set as sender address of all mails. If empty the system default (php.ini) will be used.') "Text" => _('This email address will be set as sender address of all mails.')
), ),
'801' => array( '801' => array(
"Headline" => _('Reply-to address'), "Headline" => _('Reply-to address'),

5
lam/templates/config/confmain.php
View File

@ -22,7 +22,7 @@ use \htmlGroup;
/* /*
This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/) This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
Copyright (C) 2003 - 2019 Roland Gruber Copyright (C) 2003 - 2020 Roland Gruber
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -613,6 +613,9 @@ function checkInput() {
$conf->setPwdResetDefaultPasswordOutput($_POST['pwdResetDefaultPasswordOutput']); $conf->setPwdResetDefaultPasswordOutput($_POST['pwdResetDefaultPasswordOutput']);
if (!$conf->setLamProMailFrom($_POST['pwdResetMail_from'])) { if (!$conf->setLamProMailFrom($_POST['pwdResetMail_from'])) {
$errors[] = array("ERROR", _("From address for password mails is invalid."), htmlspecialchars($_POST['pwdResetMail_from'])); $errors[] = array("ERROR", _("From address for password mails is invalid."), htmlspecialchars($_POST['pwdResetMail_from']));
}
if (!empty($_POST['pwdResetMail_subject']) && empty($_POST['pwdResetMail_from'])) {
$errors[] = array("ERROR", _("From address for password mails is invalid."), htmlspecialchars($_POST['pwdResetMail_from']));
} }
if (!$conf->setLamProMailReplyTo($_POST['pwdResetMail_replyTo'])) { if (!$conf->setLamProMailReplyTo($_POST['pwdResetMail_replyTo'])) {
$errors[] = array("ERROR", _("Reply-to address for password mails is invalid."), htmlspecialchars($_POST['pwdResetMail_replyTo'])); $errors[] = array("ERROR", _("Reply-to address for password mails is invalid."), htmlspecialchars($_POST['pwdResetMail_replyTo']));