From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop
---
plugins/password/password.php | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/plugins/password/password.php b/plugins/password/password.php
index 320d5d0..806db05 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);
@@ -164,7 +164,7 @@
// Log password change
if ($rcmail->config->get('password_log')) {
write_log('password', sprintf('Password changed for user %s (ID: %d) from %s',
- $rcmail->user->get_username(), $rcmail->user->ID, rcmail_remote_ip()));
+ $rcmail->get_user_name(), $rcmail->user->ID, rcmail_remote_ip()));
}
}
else {
@@ -280,8 +280,10 @@
return;
case PASSWORD_CRYPT_ERROR;
$reason = $this->gettext('crypterror');
+ break;
case PASSWORD_CONNECT_ERROR;
$reason = $this->gettext('connecterror');
+ break;
case PASSWORD_ERROR:
default:
$reason = $this->gettext('internalerror');
--
Gitblit v1.9.1