extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-25 01:13:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

more work regarding the implementation of the new feature that allows to specify smtp auth credentials for alarms/notifications only (otherwise credentials of corrent user are used)

Browse Source
This commit is contained in:
Klaus Leithoff 2011-10-06 09:13:48 +00:00
parent e654d3fbfb
commit d2f4d36355
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
setup/inc/hook_config.inc.php
View File

@ -235,6 +235,10 @@ function auth_type_activesync($config)
{ {
return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']); return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
} }
function auth_type_smtp($config)
{
return _options_from(emailadmin_ui::getSMTPAuthConfig(),$config['smtpAuth']);
}
/** /**
* Returns options string * Returns options string

10
setup/templates/default/config.tpl
View File

@ -184,7 +184,7 @@
</select> </select>
</td> </td>
</tr> </tr>
<tr class="row_on""> <tr class="row_on">
<td>{lang_Mail_server_login_type}:</td> <td>{lang_Mail_server_login_type}:</td>
<td> <td>
<select name="newsettings[mail_login_type]">{hook_mail_login_type}</select> <select name="newsettings[mail_login_type]">{hook_mail_login_type}</select>
@ -203,14 +203,18 @@
<td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td> <td><input name="newsettings[smtp_port]" value="{value_smtp_port}"></td>
</tr> </tr>
<tr class="row_on"> <tr class="row_on">
<td>{lang_SMTP-authentication_required}:</td>
<td><select name="newsettings[smtpAuth]"> {hook_auth_type_smtp}</select></td>
</tr>
<tr class="row_off">
<td>{lang_User_for_SMTP-authentication_(leave_it_empty_if_no_auth_required)}:</td> <td>{lang_User_for_SMTP-authentication_(leave_it_empty_if_no_auth_required)}:</td>
<td><input name="newsettings[smtp_auth_user]" value="{value_smtp_auth_user}"></td> <td><input name="newsettings[smtp_auth_user]" value="{value_smtp_auth_user}"></td>
</tr> </tr>
<tr class="row_off"> <tr class="row_on">
<td>{lang_Password_for_SMTP-authentication}:</td> <td>{lang_Password_for_SMTP-authentication}:</td>
<td><input type="password" name="newsettings[smtp_auth_passwd]" value="{value_smtp_auth_passwd}"></td> <td><input type="password" name="newsettings[smtp_auth_passwd]" value="{value_smtp_auth_passwd}"></td>
</tr> </tr>
<tr class="row_on"> <tr class="row_off">
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>
</tr> </tr>