composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 02:58:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°1319 & N°1203: Added a conf params 'email_default_sender_address' and 'email_default_sender_label' that will be used if a mail has no sender set. (forgot password, test mail, test notification mail, data source fail notification)

Browse Source 
SVN:trunk[5750]
This commit is contained in:
Stephen Abello
2018-04-27 08:29:48 +00:00
parent 2be0250aee
commit d441595ee6
6 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
setup/email.test.php
View File

@@ -181,7 +181,7 @@ function DisplayStep1(SetupPage $oP)
$aForm[] = array(
'label' => "From:",
'input' => "<input id=\"from\" type=\"text\" name=\"from\" value=\"\">",
'help' => ' defaults to \'To\'',
'help' => ' defaults to the configuration param "email_default_sender_address" or "To" field.',
);
$oP->form($aForm);
$oP->add("</fieldset>\n");
@@ -265,10 +265,6 @@ try
$oP->no_cache();
$sTo = Utils::ReadParam('to', '', false, 'raw_data');
$sFrom = Utils::ReadParam('from', '', false, 'raw_data');
if (strlen($sFrom) == 0)
{
$sFrom = $sTo;
}
DisplayStep2($oP, $sFrom, $sTo);
break;