- fix dovecotpw features

git-svn-id: https://svn.roundcube.net/trunk@3505 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/password/drivers/sql.php b/plugins/password/drivers/sql.php
index 9337a6754..d21c506ca 100644
--- a/plugins/password/drivers/sql.php
+++ b/plugins/password/drivers/sql.php
@@ -52,9 +52,9 @@ function password_save($curpass, $passwd)
 
     // dovecotpw
     if (strpos($sql, '%D') !== FALSE) {
-        if (!($dovecotpw = $rcmail->config->get('dovecotpw')))
+        if (!($dovecotpw = $rcmail->config->get('password_dovecotpw')))
             $dovecotpw = 'dovecotpw';
-        if (!($method = $rcmail->config->get('dovecotmethod')))
+        if (!($method = $rcmail->config->get('password_dovecotpw_method')))
             $method = 'CRAM-MD5';
         $tmpfile = tempnam('/tmp', 'rouncdube-');
         $pipe = popen("'$dovecotpw' -s '$method' > '$tmpfile'", "w");
@@ -66,7 +66,7 @@ function password_save($curpass, $passwd)
             fwrite($pipe, $passwd . "\n", 1+strlen($passwd)); usleep(1000);
             fwrite($pipe, $passwd . "\n", 1+strlen($passwd));
             pclose($pipe);
-            $newpass = file_get_contents($tmpfile);
+            $newpass = trim(file_get_contents($tmpfile), "\n");
             if (!preg_match('/^\{' . $method . '\}/', $newpass)) {
                 return PASSWORD_CRYPT_ERROR;
             }