- Fixed drivers namespace issues

git-svn-id: https://svn.roundcube.net/trunk@5902 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 22 insertions, 21 deletions

diff --git a/plugins/password/drivers/pam.php b/plugins/password/drivers/pam.php
index e9363cc5a..ed60bd841 100644
--- a/plugins/password/drivers/pam.php
+++ b/plugins/password/drivers/pam.php
@@ -3,18 +3,29 @@
 /**
  * PAM Password Driver
  *
- * @version 1.0
+ * @version 2.0
  * @author Aleksander Machniak
  */
- 
-function password_save($currpass, $newpass)
+
+class rcube_pam_password
 {
-    $user = $_SESSION['username'];
+    function save($currpass, $newpass)
+    {
+        $user = $_SESSION['username'];
 
-    if (extension_loaded('pam')) {
-        if (pam_auth($user, $currpass, $error, false)) {
-            if (pam_chpass($user, $currpass, $newpass)) {
-                return PASSWORD_SUCCESS;
+        if (extension_loaded('pam')) {
+            if (pam_auth($user, $currpass, $error, false)) {
+                if (pam_chpass($user, $currpass, $newpass)) {
+                    return PASSWORD_SUCCESS;
+                }
+            }
+            else {
+                raise_error(array(
+                    'code' => 600,
+                    'type' => 'php',
+                    'file' => __FILE__, 'line' => __LINE__,
+                    'message' => "Password plugin: PAM authentication failed for user $user: $error"
+                    ), true, false);
             }
         }
         else {
@@ -22,20 +33,10 @@ function password_save($currpass, $newpass)
                 'code' => 600,
                 'type' => 'php',
                 'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Password plugin: PAM authentication failed for user $user: $error"
+                'message' => "Password plugin: PECL-PAM module not loaded"
                 ), true, false);
         }
-    }
-    else {
-        raise_error(array(
-            'code' => 600,
-            'type' => 'php',
-            'file' => __FILE__, 'line' => __LINE__,
-            'message' => "Password plugin: PECL-PAM module not loaded"
-            ), true, false);
-    }
 
-    return PASSWORD_ERROR;
+        return PASSWORD_ERROR;
+    }
 }
-
-?>