From 98128f13fcdc8dca6ebefcdc93dc94b00322abb5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 16 Nov 2012 13:49:02 -0500
Subject: [PATCH] Rename option password_supported_hosts to password_hosts, code cleanup
---
plugins/password/password.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/plugins/password/password.php b/plugins/password/password.php
index cd0f5f1..028a58d 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -55,14 +55,14 @@
$rcmail = rcmail::get_instance();
$this->load_config();
-
- $host = isset( $_SESSION['imap_host'] ) ? $_SESSION['imap_host'] : NULL;
- $hosts = $rcmail->config->get( 'password_supported_hosts' );
- if ( !empty( $hosts ) and !in_array( $host, $hosts ) ) {
+
+ // Host exceptions
+ $hosts = $rcmail->config->get('password_hosts');
+ if (!empty($hosts) && !in_array($_SESSION['storage_host'], $hosts)) {
return;
}
- // Exceptions list
+ // Login exceptions
if ($exceptions = $rcmail->config->get('password_login_exceptions')) {
$exceptions = array_map('trim', (array) $exceptions);
$exceptions = array_filter($exceptions);
--
Gitblit v1.9.1