Changeset 3505 in subversion

Timestamp:

Apr 19, 2010 1:56:05 PM (3 years ago)

Author:

alec

Message:

• fix dovecotpw features

File:

• trunk/plugins/password/drivers/sql.php (modified) (2 diffs)

trunk/plugins/password/drivers/sql.php

@@ -53 +53 @@
     // 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-');
@@ -67 +67 @@
             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;