Page MenuHomePhorge
Files F223107

No OneTemporary
Actions

View Options

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,50 +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)
- {
- $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;
+ }
}
-?>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 1:28 AM (9 h, 17 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
165386
Default Alt Text
(3 KB)

Event Timeline