[Phplib-commit] CVS: php-lib-stable/php auth.inc,1.5,1.6

[Layne W. <lay...@us...>]

Update of /cvsroot/phplib/php-lib-stable/php
In directory usw-pr-cvs1:/tmp/cvs-serv2961/php

Modified Files:
	auth.inc 
Log Message:
in auth.inc, allow cancel_login to come from GET as well as POST
- was set to POST from global variable yesterday


Index: auth.inc
===================================================================
RCS file: /cvsroot/phplib/php-lib-stable/php/auth.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** auth.inc	2 Apr 2002 23:23:12 -0000	1.5
--- auth.inc	3 Apr 2002 22:53:35 -0000	1.6
***************
*** 45,49 ****
    ##
    function start() {
!     global $sess, $HTTP_POST_VARS;
  
      ## This is for performance, I guess but I'm not sure if it could
--- 45,49 ----
    ##
    function start() {
!     global $sess, $HTTP_POST_VARS, $HTTP_GET_VARS;
  
      ## This is for performance, I guess but I'm not sure if it could
***************
*** 62,67 ****
      #  1) Not logged in (no valid auth info or auth expired)
      #  2) Logged in (valid auth info)
!     #  3) Login in progress (if $HTTP_POST_VARS[$this->cancel_login],
!     #     revert to state 1)
      if ($this->is_authenticated()) {
        $uid = $this->auth["uid"];
--- 62,66 ----
      #  1) Not logged in (no valid auth info or auth expired)
      #  2) Logged in (valid auth info)
!     #  3) Login in progress (if $this->cancel_login, revert to state 1)
      if ($this->is_authenticated()) {
        $uid = $this->auth["uid"];
***************
*** 69,76 ****
          case "form":
            # Login in progress
!           if ($HTTP_POST_VARS[$this->cancel_login]) {
!             # If $HTTP_POST_VARS[$this->cancel_login] is set,
!             # delete all auth info and set state to "Not logged in",
!             # so eventually default or automatic authentication may take place
              $this->unauth();
              $state = 1;
--- 68,76 ----
          case "form":
            # Login in progress
!           if ($HTTP_POST_VARS[$this->cancel_login] or 
!               $HTTP_GET_VARS[$this->cancel_login]) {
!             # If $this->cancel_login is set, delete all auth info and set 
!             # state to "Not logged in", so eventually default or automatic
!             # authentication may take place
              $this->unauth();
              $state = 1;