- Fixed drivers namespace issues

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

1 files changed, 33 insertions, 31 deletions

diff --git a/plugins/password/drivers/vpopmaild.php b/plugins/password/drivers/vpopmaild.php
index b6fb39343..510cf3338 100644
--- a/plugins/password/drivers/vpopmaild.php
+++ b/plugins/password/drivers/vpopmaild.php
@@ -5,47 +5,49 @@
  *
  * Driver to change passwords via vpopmaild
  *
- * @version 1.1
+ * @version 2.0
  * @author Johannes Hessellund
  *
  */
 
-function password_save($curpass, $passwd)
+class rcube_vpopmaild_password
 {
-    $rcmail = rcmail::get_instance();
-//    include('Net/Socket.php');
-    $vpopmaild = new Net_Socket();
+    function save($curpass, $passwd)
+    {
+        $rcmail = rcmail::get_instance();
+    //    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))) {
-        return PASSWORD_CONNECT_ERROR;
-    }
+        if (PEAR::isError($vpopmaild->connect($rcmail->config->get('password_vpopmaild_host'),
+	        $rcmail->config->get('password_vpopmaild_port'), null))) {
+            return PASSWORD_CONNECT_ERROR;
+        }
 
-    $result = $vpopmaild->readLine();
-    if(!preg_match('/^\+OK/', $result)) {
-        $vpopmaild->disconnect();
-        return PASSWORD_CONNECT_ERROR;
-    }
+        $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("slogin ". $_SESSION['username'] . " " . $curpass);
-    $result = $vpopmaild->readLine();
-    if(!preg_match('/^\+OK/', $result) ) {
+        $vpopmaild->writeLine("mod_user ". $_SESSION['username']);
+        $vpopmaild->writeLine("clear_text_password ". $passwd);
+        $vpopmaild->writeLine(".");
+        $result = $vpopmaild->readLine();
         $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;
+        if (!preg_match('/^\+OK/', $result))
+            return PASSWORD_ERROR;
 
-    return PASSWORD_SUCCESS;
+        return PASSWORD_SUCCESS;
+    }
 }
-
-?>