Changeset 4016 in subversion

Timestamp:

Sep 29, 2010 1:23:26 PM (3 years ago)

Author:

alec

Message:

• Added possibility to display extended error messages (#1486704)
• Added extended error messages in Poppassd driver (#1486704)

Location:

trunk/plugins/password

Files:

• drivers/poppassd.php (modified) (7 diffs)
• package.xml (modified) (3 diffs)
• password.php (modified) (3 diffs)

trunk/plugins/password/drivers/poppassd.php

@@ -6 +6 @@
  * Driver to change passwords via Poppassd/Courierpassd
  *
- * @version 1.0
+ * @version 1.1
  * @author Philip Weir
  *
  */
+
+function format_error_result($code, $line)
+{
+    if (preg_match('/^\d\d\d\s+(\S.*)\s*$/', $line, $matches)) {
+        return array('code' => $code, 'message' => $matches[1]);
+    } else {
+        return $code;
+    }
+}
 
 function password_save($curpass, $passwd)
@@ -17 +26 @@
     $poppassd = new Net_Socket();
 
-    if (PEAR::isError($poppassd->connect($rcmail->config->get('password_pop_host'), $rcmail->config->get('password_pop_port'), null))) {
-        return PASSWORD_CONNECT_ERROR;
+    $result = $poppassd->connect($rcmail->config->get('password_pop_host'), $rcmail->config->get('password_pop_port'), null);
+    if (PEAR::isError($result)) {
+        return format_error_result(PASSWORD_CONNECT_ERROR, $result->getMessage());
     }
     else {
@@ -24 +34 @@
         if(!preg_match('/^2\d\d/', $result)) {
             $poppassd->disconnect();
-            return PASSWORD_ERROR;
+            return format_error_result(PASSWORD_ERROR, $result);
         }
         else {
@@ -31 +41 @@
             if(!preg_match('/^[23]\d\d/', $result) ) {
                 $poppassd->disconnect();
-                return PASSWORD_CONNECT_ERROR;
+                return format_error_result(PASSWORD_CONNECT_ERROR, $result);
             }
             else {
@@ -38 +48 @@
                 if(!preg_match('/^[23]\d\d/', $result) ) {
                     $poppassd->disconnect();
-                    return PASSWORD_ERROR;
+                    return format_error_result(PASSWORD_ERROR, $result);
                 }
                 else {
@@ -45 +55 @@
                     $poppassd->disconnect();
                     if (!preg_match('/^2\d\d/', $result))
-                        return PASSWORD_ERROR;
+                        return format_error_result(PASSWORD_ERROR, $result);
                     else
                         return PASSWORD_SUCCESS;
@@ -53 +63 @@
     }
 }
-
-?>

trunk/plugins/password/package.xml

@@ -16 +16 @@
                 <active>yes</active>
         </lead>
-        <date>2010-09-10</date>
-        <time>09:00:00</time>
+        <date>2010-09-29</date>
+        <time>19:00:00</time>
         <version>
-                <release>1.7</release>
-                <api>1.5</api>
+                <release>1.8</release>
+                <api>1.6</api>
         </version>
         <stability>
@@ -28 +28 @@
         <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
         <notes>
-- Added XMail driver
-- Improve security of chpasswd driver using popen instead of exec+echo (#1486987)
-- Added chpass-wrapper.py script to improve security (#1486987)
+- Added possibility to display extended error messages (#1486704)
+- Added extended error messages in Poppassd driver (#1486704)
     </notes>
         <contents>
@@ -154 +153 @@
             </notes>
         </release>
-        </changelog>
+        <release>
+                <date>2010-09-10</date>
+                <time>09:00:00</time>
+                <version>
+                        <release>1.7</release>
+                        <api>1.5</api>
+                </version>
+                <stability>
+                        <release>stable</release>
+                        <api>stable</api>
+                </stability>
+                <license uri="http://www.gnu.org/licenses/gpl-2.0.html">GNU GPLv2</license>
+                <notes>
+- Added XMail driver
+- Improve security of chpasswd driver using popen instead of exec+echo (#1486987)
+- Added chpass-wrapper.py script to improve security (#1486987)
+            </notes>
+            </release>
+    </changelog>
 </package>

trunk/plugins/password/password.php

@@ -6 +6 @@
  | @version @package_version@                                                             |
  |                                                                         |
- | Copyright (C) 2009, Roundcube Dev.                                      |
+ | Copyright (C) 2009-2010, Roundcube Dev.                                 |
  |                                                                         |
  | This program is free software; you can redistribute it and/or modify    |
@@ -125 +125 @@
             }
             // try to save the password
-            else if (!($res = $this->_save($curpwd,$newpwd))) {
+            else if (!($res = $this->_save($curpwd, $newpwd))) {
                 $rcmail->output->command('display_message', $this->gettext('successfullysaved'), 'confirmation');
                 $_SESSION['password'] = $rcmail->encrypt($newpwd);
@@ -230 +230 @@
         $result = password_save($curpass, $passwd);
 
+        if (is_array($result)) {
+            $result  = $result['code'];
+            $message = $result['message'];
+        }
+
         switch ($result) {
             case PASSWORD_SUCCESS:
                 return;
             case PASSWORD_CRYPT_ERROR;
-                return $this->gettext('crypterror');
+                $reason = $this->gettext('crypterror');
             case PASSWORD_CONNECT_ERROR;
-                return $this->gettext('connecterror');
+                $reason = $this->gettext('connecterror');
             case PASSWORD_ERROR:
             default:
-                return $this->gettext('internalerror');
-        }
+                $reason = $this->gettext('internalerror');
+        }
+
+        if ($message) {
+            $reason .= ' ' . $message;
+        }
+
+        return $reason;
     }                                     
 }
-
-?>