From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
plugins/password/drivers/poppassd.php | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/plugins/password/drivers/poppassd.php b/plugins/password/drivers/poppassd.php
index 8a54fb7..7a28210 100644
--- a/plugins/password/drivers/poppassd.php
+++ b/plugins/password/drivers/poppassd.php
@@ -5,52 +5,78 @@
*
* Driver to change passwords via Poppassd/Courierpassd
*
- * @version 1.0
+ * @version 2.0
* @author Philip Weir
*
+ * Copyright (C) 2005-2013, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
-function password_save($curpass, $passwd)
+class rcube_poppassd_password
{
- $rcmail = rcmail::get_instance();
-// include('Net/Socket.php');
- $poppassd = new Net_Socket();
+ function format_error_result($code, $line)
+ {
+ if (preg_match('/^\d\d\d\s+(\S.*)\s*$/', $line, $matches)) {
+ return array('code' => $code, 'message' => $matches[1]);
+ }
- if (PEAR::isError($poppassd->connect($rcmail->config->get('password_pop_host'), $rcmail->config->get('password_pop_port'), null))) {
- return PASSWORD_CONNECT_ERROR;
+ return $code;
}
- else {
- $result = $poppassd->readLine();
- if(!preg_match('/^2\d\d/', $result)) {
- $poppassd->disconnect();
- return PASSWORD_ERROR;
+
+ function save($curpass, $passwd)
+ {
+ $rcmail = rcmail::get_instance();
+// include('Net/Socket.php');
+ $poppassd = new Net_Socket();
+
+ $result = $poppassd->connect($rcmail->config->get('password_pop_host'), $rcmail->config->get('password_pop_port'), null);
+ if (is_a($result, 'PEAR_Error')) {
+ return $this->format_error_result(PASSWORD_CONNECT_ERROR, $result->getMessage());
}
else {
- $poppassd->writeLine("user ". $_SESSION['username']);
$result = $poppassd->readLine();
- if(!preg_match('/^[23]\d\d/', $result) ) {
+ if(!preg_match('/^2\d\d/', $result)) {
$poppassd->disconnect();
- return PASSWORD_CONNECT_ERROR;
+ return $this->format_error_result(PASSWORD_ERROR, $result);
}
else {
- $poppassd->writeLine("pass ". $curpass);
+ $poppassd->writeLine("user ". $_SESSION['username']);
$result = $poppassd->readLine();
- if(!preg_match('/^[23]\d\d/', $result) ) {
+ if (!preg_match('/^[23]\d\d/', $result) ) {
$poppassd->disconnect();
- return PASSWORD_ERROR;
+ return $this->format_error_result(PASSWORD_CONNECT_ERROR, $result);
}
else {
- $poppassd->writeLine("newpass ". $passwd);
+ $poppassd->writeLine("pass ". $curpass);
$result = $poppassd->readLine();
- $poppassd->disconnect();
- if (!preg_match('/^2\d\d/', $result))
- return PASSWORD_ERROR;
- else
+ if (!preg_match('/^[23]\d\d/', $result) ) {
+ $poppassd->disconnect();
+ return $this->format_error_result(PASSWORD_ERROR, $result);
+ }
+ else {
+ $poppassd->writeLine("newpass ". $passwd);
+ $result = $poppassd->readLine();
+ $poppassd->disconnect();
+ if (!preg_match('/^2\d\d/', $result)) {
+ return $this->format_error_result(PASSWORD_ERROR, $result);
+ }
+
return PASSWORD_SUCCESS;
+ }
}
}
}
}
}
-
-?>
--
Gitblit v1.9.1