- Fixed drivers namespace issues

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

1 files changed, 21 insertions, 18 deletions

diff --git a/plugins/password/drivers/chpasswd.php b/plugins/password/drivers/chpasswd.php
index 28c3e5d7a..cce7c1f42 100644
--- a/plugins/password/drivers/chpasswd.php
+++ b/plugins/password/drivers/chpasswd.php
@@ -8,29 +8,32 @@
  *
  * For installation instructions please read the README file.
  *
- * @version 1.0
+ * @version 2.0
  * @author Alex Cartwright <acartwright@mutinydesign.co.uk)
  */
 
-function password_save($currpass, $newpass)
+class rcube_chpasswd_password
 {
-    $cmd = rcmail::get_instance()->config->get('password_chpasswd_cmd');
-    $username = $_SESSION['username'];
+    public function save($currpass, $newpass)
+    {
+        $cmd = rcmail::get_instance()->config->get('password_chpasswd_cmd');
+        $username = $_SESSION['username'];
 
-    $handle = popen($cmd, "w");
-    fwrite($handle, "$username:$newpass\n");
+        $handle = popen($cmd, "w");
+        fwrite($handle, "$username:$newpass\n");
 
-    if (pclose($handle) == 0) {
-        return PASSWORD_SUCCESS;
-    }
-    else {
-        raise_error(array(
-            'code' => 600,
-            'type' => 'php',
-            'file' => __FILE__, 'line' => __LINE__,
-            'message' => "Password plugin: Unable to execute $cmd"
-            ), true, false);
-    }
+        if (pclose($handle) == 0) {
+            return PASSWORD_SUCCESS;
+        }
+        else {
+            raise_error(array(
+                'code' => 600,
+                'type' => 'php',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Password plugin: Unable to execute $cmd"
+                ), true, false);
+        }
 
-    return PASSWORD_ERROR;
+        return PASSWORD_ERROR;
+    }
 }