diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-12-16 17:03:21 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-12-16 17:03:21 +0100 |
| commit | 939f94bb732300e167ddc51f266743b88ae0867f (patch) | |
| tree | 5f83b9aa30ddf2e4fc1a3636bd1a8c5b7dabb642 | |
| parent | a072247dde60497f879b2a00790a6ec0a64fab4c (diff) | |
| parent | df8ada1f19da8677f0efa35de07f6625510fdc6f (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
| -rw-r--r-- | plugins/http_authentication/config.inc.php.dist | 9 | ||||
| -rw-r--r-- | plugins/http_authentication/http_authentication.php | 9 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/plugins/http_authentication/config.inc.php.dist b/plugins/http_authentication/config.inc.php.dist new file mode 100644 index 000000000..0d798a586 --- /dev/null +++ b/plugins/http_authentication/config.inc.php.dist @@ -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'] = ''; diff --git a/plugins/http_authentication/http_authentication.php b/plugins/http_authentication/http_authentication.php index c278b3cfc..a94b6121a 100644 --- a/plugins/http_authentication/http_authentication.php +++ b/plugins/http_authentication/http_authentication.php @@ -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'])) { diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index bd381d5c0..88391b102 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1528,7 +1528,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null, if ($addicon && $_SESSION['writeable_abook']) { $address .= html::a(array( 'href' => "#add", - 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, $string), + 'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, JQ($string)), 'title' => rcube_label('addtoaddressbook'), 'class' => 'rcmaddcontact', ), |