3 files changed, 57 insertions, 4 deletions
diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
index 3e3bca9e1..5c4deb770 100644
--- a/plugins/acl/acl.php
+++ b/plugins/acl/acl.php
@@ -696,10 +696,8 @@ class acl extends rcube_plugin
         }
 
         // add UID field to fieldmap, so it will be returned in a record with name
-        $config['fieldmap'] = array(
-            'name' => $name_field,
-            'uid'  => $uid_field,
-        );
+        $config['fieldmap']['name'] = $name_field;
+        $config['fieldmap']['uid']  = $uid_field;
 
         // search in UID and name fields
         $config['search_fields']   = array_values($config['fieldmap']);
diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist
index 16b7f9317..d979a1901 100644
--- a/plugins/password/config.inc.php.dist
+++ b/plugins/password/config.inc.php.dist
@@ -367,3 +367,8 @@ $config['password_expect_params'] = '';
 $config['password_smb_host'] = 'localhost';
 // Location of smbpasswd binary
 $config['password_smb_cmd'] = '/usr/bin/smbpasswd';
+
+// gearman driver options
+// ---------------------
+// Gearman host (default: localhost)
+$config['password_gearman_host'] = 'localhost';
diff --git a/plugins/password/drivers/gearman.php b/plugins/password/drivers/gearman.php
new file mode 100644
index 000000000..6c1ad3cf0
--- /dev/null
+++ b/plugins/password/drivers/gearman.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Gearman Password Driver
+ *
+ * Payload is json string containing username, oldPassword and newPassword
+ * Return value is a json string saying result: true if success.
+ *
+ * @version 1.0
+ * @author Mohammad Anwari <mdamt@mdamt.net>
+ */
+
+class rcube_gearman_password
+{
+  function save($currpass, $newpass)
+  {
+    $user = $_SESSION['username'];
+    $rcmail = rcmail::get_instance();
+
+    if (extension_loaded('gearman')) {
+      $success = false;
+      $gmc= new GearmanClient();
+
+      $gmc->addServer($rcmail->config->get('password_gearman_host'));
+      $payload = array("username" => $user, "oldPassword" => $currpass, "newPassword" => $newpass);
+      $result = $gmc->doNormal("setPassword", json_encode($payload));
+      $success = json_decode($result);
+      if ($success->result == 1) {
+        return PASSWORD_SUCCESS;
+      } else {
+        rcube::raise_error(array(
+          'code' => 600,
+          'type' => 'php',
+          'file' => __FILE__, 'line' => __LINE__,
+          'message' => "Password plugin: Gearman authentication failed for user $user: $error"
+        ), true, false);
+      }
+    }
+    else {
+      rcube::raise_error(array(
+        'code' => 600,
+        'type' => 'php',
+        'file' => __FILE__, 'line' => __LINE__,
+        'message' => "Password plugin: PECL Gearman module not loaded"
+      ), true, false);
+    }
+
+    return PASSWORD_ERROR;
+  }
+}
+?>