From a65bf3a14b617d4af6749bab9e6ac7668fb99292 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 06 Feb 2010 12:59:41 -0500
Subject: [PATCH] - Password: fix vpopmaild driver (#1486478)
---
CHANGELOG | 1
plugins/password/drivers/vpopmaild.php | 65 ++++++++++++++------------------
plugins/password/password.php | 3 -
3 files changed, 30 insertions(+), 39 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 5c9d213..6416ca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Password: fix vpopmaild driver (#1486478)
- Add workaround for MySQL bug [http://bugs.mysql.com/bug.php?id=46293] (#1486474)
- Fix quoted text wrapping when replying to an HTML email in plain text (#1484141)
- Fix handling of extended mailto links (with params) (#1486354)
diff --git a/plugins/password/drivers/vpopmaild.php b/plugins/password/drivers/vpopmaild.php
index db57eaf..b6fb393 100644
--- a/plugins/password/drivers/vpopmaild.php
+++ b/plugins/password/drivers/vpopmaild.php
@@ -5,7 +5,7 @@
*
* Driver to change passwords via vpopmaild
*
- * @version 1.0
+ * @version 1.1
* @author Johannes Hessellund
*
*/
@@ -16,45 +16,36 @@
// include('Net/Socket.php');
$vpopmaild = new Net_Socket();
- if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'), $rcmail->config->get('password_vpopmaild_port'), null))) {
+ if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'),
+ $rcmail->config->get('password_vpopmaild_port'), null))) {
return PASSWORD_CONNECT_ERROR;
}
- else {
- $result = $vpopmaild->readLine();
- if(!preg_match('/^\+OK/', $result)) {
- $vpopmaild->disconnect();
- return PASSWORD_CONNECT_ERROR;
- }
- else {
- $vpopmaild->writeLine("slogin ". $_SESSION['username'] . " " . $curpass);
- $result = $vpopmaild->readLine();
- if(!preg_match('/^\+OK/', $result) ) {
- $vpopmaild->writeLine("quit");
- $vpopmaild->disconnect();
- return PASSWORD_ERROR;
- }
- else {
- $vpopmaild->writeLine("mod_user ". $_SESSION['username']);
- $result = $vpopmaild->readLine();
- if(!preg_match('/^\+OK/', $result) ) {
- $vpopmaild->writeLine("quit");
- $vpopmaild->disconnect();
- return PASSWORD_ERROR;
- }
- else {
- $vpopmaild->writeLine("clear_text_password ". $passwd);
- $vpopmaild->writeLine(".");
- $result = $vpopmaild->readLine();
- $vpopmaild->writeLine("quit");
- $vpopmaild->disconnect();
- if (!preg_match('/^\+OK/', $result))
- return PASSWORD_ERROR;
- else
- return PASSWORD_SUCCESS;
- }
- }
- }
+
+ $result = $vpopmaild->readLine();
+ if(!preg_match('/^\+OK/', $result)) {
+ $vpopmaild->disconnect();
+ return PASSWORD_CONNECT_ERROR;
}
+
+ $vpopmaild->writeLine("slogin ". $_SESSION['username'] . " " . $curpass);
+ $result = $vpopmaild->readLine();
+ if(!preg_match('/^\+OK/', $result) ) {
+ $vpopmaild->writeLine("quit");
+ $vpopmaild->disconnect();
+ return PASSWORD_ERROR;
+ }
+
+ $vpopmaild->writeLine("mod_user ". $_SESSION['username']);
+ $vpopmaild->writeLine("clear_text_password ". $passwd);
+ $vpopmaild->writeLine(".");
+ $result = $vpopmaild->readLine();
+ $vpopmaild->writeLine("quit");
+ $vpopmaild->disconnect();
+
+ if (!preg_match('/^\+OK/', $result))
+ return PASSWORD_ERROR;
+
+ return PASSWORD_SUCCESS;
}
?>
diff --git a/plugins/password/password.php b/plugins/password/password.php
index a03d354..4f34e40 100644
--- a/plugins/password/password.php
+++ b/plugins/password/password.php
@@ -3,7 +3,7 @@
/*
+-------------------------------------------------------------------------+
| Password Plugin for Roundcube |
- | Version 1.3.1 |
+ | Version 1.3.2 |
| |
| Copyright (C) 2009, RoundCube Dev. |
| |
@@ -42,7 +42,6 @@
*
* For installation and configuration instructions please read the README file.
*
- * @version 1.3.1
* @author Aleksander Machniak
*/
class password extends rcube_plugin
--
Gitblit v1.9.1