Fix merge error that disabled contact drag'n'drop

Thomas Bruederli

2014-08-19 fc52af24f1418d6590a2d37a0d8cc31b123e38f6

 plugins/password/drivers/vpopmaild.php

@@ -5,56 +5,49 @@
 *
 * Driver to change passwords via vpopmaild
 *
 * @version 1.0
 * @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;
    }
    else {
        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;
        }
        else {
            $vpopmaild->writeLine("slogin ". $_SESSION['username'] . " " . $curpass);
            $result = $vpopmaild->readLine();
            if(!preg_match('/^\+OK/', $result) ) {
                $vpopmaild->writeLine("quit");
                $vpopmaild->disconnect();
                return PASSWORD_ERROR;
            }
            else {
                $vpopmaild->writeLine("mod_user ". $_SESSION['username']);
                $result = $vpopmaild->readLine();
                if(!preg_match('/^\+OK/', $result) ) {
                    $vpopmaild->writeLine("quit");
                    $vpopmaild->disconnect();
                    return PASSWORD_ERROR;
                }
                else {
                    $vpopmaild->writeLine("clear_text_password ". $passwd);
                    $vpopmaild->writeLine(".");
                    $result = $vpopmaild->readLine();
                    $vpopmaild->writeLine("quit");
                    $vpopmaild->disconnect();
                    if (!preg_match('/^\+OK/', $result))
                        return PASSWORD_ERROR;
                    else
                        return PASSWORD_SUCCESS;
                }
            }

        $vpopmaild->writeLine("slogin ". $_SESSION['username'] . " " . $curpass);
        $result = $vpopmaild->readLine();

        if(!preg_match('/^\+OK/', $result) ) {
            $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;

        return PASSWORD_SUCCESS;
    }
}

?>