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/drivers/sasl.php | 46 +++++++++++++++++++++++++---------------------
1 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/plugins/password/drivers/sasl.php b/plugins/password/drivers/sasl.php
index 3613334..9380cf8 100644
--- a/plugins/password/drivers/sasl.php
+++ b/plugins/password/drivers/sasl.php
@@ -7,35 +7,39 @@
* The code is derrived from the Squirrelmail "Change SASL Password" Plugin
* by Galen Johnson.
*
- * It only works with saslpasswd2 on the same host where RoundCube runs
+ * It only works with saslpasswd2 on the same host where Roundcube runs
* and requires shell access and gcc in order to compile the binary.
*
* For installation instructions please read the README file.
*
- * @version 1.0
+ * @version 2.0
* @author Thomas Bruederli
*/
-
-function password_save($currpass, $newpass)
+
+class rcube_sasl_password
{
- $curdir = realpath(dirname(__FILE__));
- $username = escapeshellcmd($_SESSION['username']);
+ function save($currpass, $newpass)
+ {
+ $curdir = RCUBE_PLUGINS_DIR . 'password/helpers';
+ $username = escapeshellcmd($_SESSION['username']);
+ $args = rcmail::get_instance()->config->get('password_saslpasswd_args', '');
- if ($fh = popen("$curdir/chgsaslpasswd -p $username", 'w')) {
- fwrite($fh, $newpass."\n");
- $code = pclose($fh);
+ if ($fh = popen("$curdir/chgsaslpasswd -p $args $username", 'w')) {
+ fwrite($fh, $newpass."\n");
+ $code = pclose($fh);
- if($code == 0)
- return PASSWORD_SUCCESS;
- } else
- raise_error(array(
- 'code' => 600,
- 'type' => 'php',
- 'file' = __FILE__,
- 'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
- ), true, false);
+ if ($code == 0)
+ return PASSWORD_SUCCESS;
+ }
+ else {
+ raise_error(array(
+ 'code' => 600,
+ 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Password plugin: Unable to execute $curdir/chgsaslpasswd"
+ ), true, false);
+ }
- return PASSWORD_ERROR;
+ return PASSWORD_ERROR;
+ }
}
-
-?>
--
Gitblit v1.9.1