Merge branch 'master' of https://github.com/roundcube/roundcubemail

Andy Wermke

2013-04-04 92cd7f34b07e86062f2c024039e3309768b48ce6

 plugins/password/drivers/directadmin.php

@@ -34,16 +34,16 @@
        $Socket->set_method('POST');
        $Socket->query('/CMD_CHANGE_EMAIL_PASSWORD',
            array(
                'email'       => $da_user,
                'oldpassword'    => $da_curpass,
                'password1'    => $da_newpass,
                'password2'    => $da_newpass,
                'api'          => '1'
                'email'         => $da_user,
                'oldpassword'   => $da_curpass,
                'password1'     => $da_newpass,
                'password2'     => $da_newpass,
                'api'           => '1'
            ));
        $response = $Socket->fetch_parsed_body();

        //DEBUG
        //console("Password Plugin: [USER: $da_user] [HOST: $da_host] - Response: [SOCKET: ".$Socket->result_status_code."] [DA ERROR: ".strip_tags($response['error'])."] [TEXT: ".$response[text]."]");
        //rcube::console("Password Plugin: [USER: $da_user] [HOST: $da_host] - Response: [SOCKET: ".$Socket->result_status_code."] [DA ERROR: ".strip_tags($response['error'])."] [TEXT: ".$response[text]."]");

        if($Socket->result_status_code != 200)
            return array('code' => PASSWORD_CONNECT_ERROR, 'message' => $Socket->error[0]);
@@ -72,7 +72,7 @@
class HTTPSocket {

    var $version = '2.8';
    

    /* all vars are private except $error, $query_cache, and $doFollowLocationHeader */

    var $method = 'GET';
@@ -173,7 +173,7 @@
            $location = parse_url($request);
            $this->connect($location['host'],$location['port']);
            $this->set_login($location['user'],$location['pass']);
            

            $request = $location['path'];
            $content = $location['query'];

@@ -326,7 +326,7 @@
            }

        }
        

        list($this->result_header,$this->result_body) = preg_split("/\r\n\r\n/",$this->result,2);

        if ($this->bind_host)
@@ -365,7 +365,6 @@
                $this->query($headers['location']);
            }
        }
        
    }

    function getTransferSpeed()
@@ -449,8 +448,7 @@
    function fetch_header( $header = '' )
    {
        $array_headers = preg_split("/\r\n/",$this->result_header);
        
        $array_return = array( 0 => $array_headers[0] );
        $array_return  = array( 0 => $array_headers[0] );
        unset($array_headers[0]);

        foreach ( $array_headers as $pair )