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

7.2

This commit is contained in:
Roland Gruber 2020-04-21 21:18:39 +02:00
parent d980ffc1a5
commit 5a40e6fed1
6 changed files with 2846 additions and 2605 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lam/help/help.inc
View File

@ -238,9 +238,9 @@ $helpArray = array (
'287' => array ("Headline" => _('Licence'),
"Text" => _('Please enter your licence key.')),
'288' => array ("Headline" => _('Expiration warning'),
"Text" => _('Please select how to be warned before your license expires.')),
"Text" => _('Please select how to be warned before your licence expires.')),
'289' => array ("Headline" => _('From address'),
"Text" => _('This email address will be set as sender address of all mails.')),
"Text" => _('This email address will be set as sender address of the mails.')),
'290' => array ("Headline" => _('TO address'),
"Text" => _('This email address will be set as TO address for the mails.')),
// 300 - 399
@ -388,7 +388,7 @@ $helpArray = array (
// jobs
'800' => array(
"Headline" => _('From address'),
"Text" => _('This email address will be set as sender address of all mails.')
"Text" => _('This email address will be set as sender address of the mails.')
),
'801' => array(
"Headline" => _('Reply-to address'),

BIN
lam/locale/de_DE/LC_MESSAGES/messages.mo
View File

Binary file not shown.

2660
lam/locale/de_DE/LC_MESSAGES/messages.po
View File

File diff suppressed because it is too large Load Diff

BIN
lam/locale/en_US/LC_MESSAGES/messages.mo
View File

Binary file not shown.

2781
lam/locale/en_US/LC_MESSAGES/messages.po
View File

File diff suppressed because it is too large Load Diff

4
lam/templates/config/mainmanage.php
View File

@ -111,11 +111,11 @@ if (isset($_POST['submitFormData'])) {
$cfg->licenseEmailTo = $_POST['licenseEmailTo'];
if ((($cfg->licenseWarningType === LAMCfgMain::LICENSE_WARNING_EMAIL) || ($cfg->licenseWarningType === LAMCfgMain::LICENSE_WARNING_ALL))
&& !get_preg($cfg->licenseEmailFrom, 'email')) {
$errors[] = _('License') . ': ' . _('From address') . ' - ' . _('Please enter a valid email address!');
$errors[] = _('Licence') . ': ' . _('From address') . ' - ' . _('Please enter a valid email address!');
}
if ((($cfg->licenseWarningType === LAMCfgMain::LICENSE_WARNING_EMAIL) || ($cfg->licenseWarningType === LAMCfgMain::LICENSE_WARNING_ALL))
&& !get_preg($cfg->licenseEmailTo, 'email')) {
$errors[] = _('License') . ': ' . _('TO address') . ' - ' . _('Please enter a valid email address!');
$errors[] = _('Licence') . ': ' . _('TO address') . ' - ' . _('Please enter a valid email address!');
}
}
// set session timeout