Merge pull request #50 from weisslj/master

Add host config option to http_authentication plugin.
pull/53/head
Aleksander Machniak 12 years ago
commit df8ada1f19

@ -0,0 +1,9 @@
<?php
// HTTP Basic Authentication Plugin options
// ----------------------------------------
// Default mail host to log-in using user/password from HTTP Authentication.
// This is useful if the users are free to choose arbitrary mail hosts (or
// from a list), but have one host they usually want to log into.
// Unlike $rcmail_config['default_host'] this must be a string!
$rcmail_config['http_authentication_host'] = '';

@ -11,6 +11,8 @@
*
* See logout.html (in this directory) for an example how HTTP auth can be cleared.
*
* For other configuration options, see config.inc.php.dist!
*
* @version @package_version@
* @license GNU GPLv3+
* @author Thomas Bruederli
@ -46,6 +48,13 @@ class http_authentication extends rcube_plugin
function authenticate($args)
{
// Load plugin's config file
$this->load_config();
$host = rcmail::get_instance()->config->get('http_authentication_host');
if (is_string($host) && trim($host) !== '')
$args['host'] = rcube_idn_to_ascii(rcube_parse_host($host));
// Allow entering other user data in login form,
// e.g. after log out (#1487953)
if (!empty($args['user'])) {

Loading…
Cancel
Save