Rename option password_supported_hosts to password_hosts, code cleanup

pull/46/merge
Aleksander Machniak 12 years ago
parent 657864a29c
commit 98128f13fc

@ -1,14 +1,5 @@
<?php <?php
// Supported hosts
// -----------------------
// Array of hosts that support password changing.
// Default is NULL. Supported hosts will feature
// a Password option in Settings; others will not.
// Example:
//$rcmail_config['password_supported_hosts'] = array( 'mail.example.com', 'mail2.example.org' );
$rcmail_config['password_supported_hosts'] = NULL;
// Password Plugin options // Password Plugin options
// ----------------------- // -----------------------
// A driver to use for password change. Default: "sql". // A driver to use for password change. Default: "sql".
@ -34,6 +25,12 @@ $rcmail_config['password_log'] = false;
// will be not available (no Password tab in Settings) // will be not available (no Password tab in Settings)
$rcmail_config['password_login_exceptions'] = null; $rcmail_config['password_login_exceptions'] = null;
// Array of hosts that support password changing. Default is NULL.
// Listed hosts will feature a Password option in Settings; others will not.
// Example:
//$rcmail_config['password_hosts'] = array('mail.example.com', 'mail2.example.org');
$rcmail_config['password_hosts'] = null;
// SQL Driver options // SQL Driver options
// ------------------ // ------------------

@ -27,6 +27,7 @@
<license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license> <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
<notes> <notes>
- Fix wrong (non-specific) error message on crypt or connection error (#1488808) - Fix wrong (non-specific) error message on crypt or connection error (#1488808)
- Added option to define IMAP hosts that support password changes - password_hosts
</notes> </notes>
<contents> <contents>
<dir baseinstalldir="/" name="/"> <dir baseinstalldir="/" name="/">

@ -56,13 +56,13 @@ class password extends rcube_plugin
$this->load_config(); $this->load_config();
$host = isset( $_SESSION['imap_host'] ) ? $_SESSION['imap_host'] : NULL; // Host exceptions
$hosts = $rcmail->config->get( 'password_supported_hosts' ); $hosts = $rcmail->config->get('password_hosts');
if ( !empty( $hosts ) and !in_array( $host, $hosts ) ) { if (!empty($hosts) && !in_array($_SESSION['storage_host'], $hosts)) {
return; return;
} }
// Exceptions list // Login exceptions
if ($exceptions = $rcmail->config->get('password_login_exceptions')) { if ($exceptions = $rcmail->config->get('password_login_exceptions')) {
$exceptions = array_map('trim', (array) $exceptions); $exceptions = array_map('trim', (array) $exceptions);
$exceptions = array_filter($exceptions); $exceptions = array_filter($exceptions);

Loading…
Cancel
Save