From 1599665651a3e6e259091e3f9576c47c06b20a30 Mon Sep 17 00:00:00 2001
From: Mohammad Anwari <mdamt@mdamt.net>
Date: Mon, 14 Jul 2014 23:54:32 +0700
Subject: New gearman driver for password plugin

---
 plugins/password/drivers/gearman.php | 50 ++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 plugins/password/drivers/gearman.php

(limited to 'plugins/password/drivers/gearman.php')

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;
+  }
+}
+?>
-- 
cgit v1.2.3


From 9d2550502a68ea3cc495e287ebff04e142a59e2e Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 16 Jul 2014 15:12:53 +0200
Subject: CS fixes after PR merge

---
 plugins/password/drivers/gearman.php | 71 +++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 33 deletions(-)

(limited to 'plugins/password/drivers/gearman.php')

diff --git a/plugins/password/drivers/gearman.php b/plugins/password/drivers/gearman.php
index 6c1ad3cf0..36571a98f 100644
--- a/plugins/password/drivers/gearman.php
+++ b/plugins/password/drivers/gearman.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Gearman Password Driver
  *
@@ -11,40 +12,44 @@
 
 class rcube_gearman_password
 {
-  function save($currpass, $newpass)
-  {
-    $user = $_SESSION['username'];
-    $rcmail = rcmail::get_instance();
+    function save($currpass, $newpass)
+    {
+        if (extension_loaded('gearman')) {
+            $rcmail  = rcmail::get_instance();
+            $user    = $_SESSION['username'];
+            $payload = array(
+                'username'    => $user,
+                'oldPassword' => $currpass,
+                'newPassword' => $newpass,
+            );
 
-    if (extension_loaded('gearman')) {
-      $success = false;
-      $gmc= new GearmanClient();
+            $gmc = new GearmanClient();
+            $gmc->addServer($rcmail->config->get('password_gearman_host'));
 
-      $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);
-    }
+            $result  = $gmc->doNormal('setPassword', json_encode($payload));
+            $success = json_decode($result);
 
-    return PASSWORD_ERROR;
-  }
+            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;
+    }
 }
-?>
-- 
cgit v1.2.3