[sieve-php-cvs] sieve-php sieve-php.lib.php,1.3,1.4

[<av...@us...>]

Update of /cvsroot/sieve-php/sieve-php
In directory sc8-pr-cvs1:/tmp/cvs-serv6255

Modified Files:
	sieve-php.lib.php 
Log Message:
Fixed LOGIN auth. mechanism, Nigel Hathaway

Index: sieve-php.lib.php
===================================================================
RCS file: /cvsroot/sieve-php/sieve-php/sieve-php.lib.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sieve-php.lib.php	18 Dec 2003 12:58:49 -0000	1.3
--- sieve-php.lib.php	18 Dec 2003 13:18:05 -0000	1.4
***************
*** 627,631 ****
     * such as PLAIN or DIGEST-MD5.
     *
-    * @todo Bugfix and test LOGIN authenticate code.
     */
    function authenticate() {
--- 627,630 ----
***************
*** 726,751 ****
  
  	case "LOGIN":
! 	    /*
! 	    // Untested code!
! 
! 	    $login=base64_encode($this->user);
! 	    $pass=base64_encode($this->pass);
! 
! 	    fputs($this->fp, "AUTHENTICATE \"LOGIN\" {0+}\r\n\r\n");
! 	    fputs($this->fp, "{".strlen($login)."+}\r\n");
! 	    fputs($this->fp, "$login\r\n");
! 	    fputs($this->fp, "{".strlen($pass)."+}\r\n");
! 	    fputs($this->fp, "$pass\r\n");
! 
! 	    $this->line=fgets($this->fp,1024);
! 	    while(sieve::status($this->line) == F_DATA)
! 		$this->line=fgets($this->fp,1024);
! 
! 	    if(sieve::status($this->line) == F_NO)
! 		return false;
! 	    $this->loggedin=true;
! 		return true;
! 	break;
! 	*/
  
          default:
--- 725,747 ----
  
  	case "LOGIN":
!  	     $login=base64_encode($this->user);
!  	     $pass=base64_encode($this->pass);
!  	
!  	     fputs($this->fp, "AUTHENTICATE \"LOGIN\"\r\n");
!  	     fputs($this->fp, "{".strlen($login)."+}\r\n");
!  	     fputs($this->fp, "$login\r\n");
!  	     fputs($this->fp, "{".strlen($pass)."+}\r\n");
!  	     fputs($this->fp, "$pass\r\n");
!  
! 	     $this->line=fgets($this->fp,1024);
!  	     while(sieve::status($this->line) == F_HEAD ||
!  	           sieve::status($this->line) == F_DATA)
!  	         $this->line=fgets($this->fp,1024);
!  	
!  	     if(sieve::status($this->line) == F_NO)
!  	         return false;
!  	     $this->loggedin=true;
!  	     return true;
!  	     break;
  
          default: