Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 55 insertions, 0 deletions

diff --git a/plugins/password/drivers/gearman.php b/plugins/password/drivers/gearman.php
new file mode 100644
index 000000000..36571a98f
--- /dev/null
+++ b/plugins/password/drivers/gearman.php
@@ -0,0 +1,55 @@
+<?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)
+    {
+        if (extension_loaded('gearman')) {
+            $rcmail  = rcmail::get_instance();
+            $user    = $_SESSION['username'];
+            $payload = array(
+                'username'    => $user,
+                'oldPassword' => $currpass,
+                'newPassword' => $newpass,
+            );
+
+            $gmc = new GearmanClient();
+            $gmc->addServer($rcmail->config->get('password_gearman_host'));
+
+            $result  = $gmc->doNormal('setPassword', json_encode($payload));
+            $success = json_decode($result);
+
+            if ($success && $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;
+    }
+}