[phpwiki-checkins] CVS: phpwiki/lib WikiUser.php,1.3,1.4

[Joe E. <joe...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv17787

Modified Files:
	WikiUser.php 
Log Message:
A patch necessary to support plugin/UserPage.php.  The problem was that
WikiUser() was checking the http auth status and resetting the
session/cookie auth data on every single pageload, which made it impossible
for another auth solution to compete.  With this patch they both work.  Feel
free to refactor it.



Index: WikiUser.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiUser.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** WikiUser.php	2001/11/29 18:03:59	1.3
--- WikiUser.php	2001/12/02 02:34:48	1.4
***************
*** 21,25 ****
          // Restore from cookie.
          $this->_restore();
!         
          if ($this->state == 'authorized' && $auth_mode == 'LOGIN') {
              // ...logout
--- 21,31 ----
          // Restore from cookie.
          $this->_restore();
! 
!         // don't check for HTTP auth if there's nothing to worry about
!         if (  $this->state == 'authorized' 
!               && $auth_mode != 'LOGIN' 
!               && $auth_mode != 'LOGOUT'  )
!             return;   
! 
          if ($this->state == 'authorized' && $auth_mode == 'LOGIN') {
              // ...logout