[Phpslash-commit] CVS: phpslash-dev/include/modules/auth slashAuth.class,1.6,1.7

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

Update of /cvsroot/phpslash/phpslash-dev/include/modules/auth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9400/phpslash-dev/include/modules/auth

Modified Files:
	slashAuth.class 
Log Message:
remember me preauth fix

Index: slashAuth.class
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/auth/slashAuth.class,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slashAuth.class	29 Oct 2004 17:35:09 -0000	1.6
--- slashAuth.class	29 Oct 2004 20:22:14 -0000	1.7
***************
*** 185,192 ****
           $user_info = $this->get_psluser_info($cookie_ary[1]);
           
!          $is_user = $this->psl_preauth($user_info['author_name'], $user_info['password'], $user_info);
           
           // if the user is not found - apply any preferences
!          if ($is_user == false) {
              if(!empty($cookie_ary['preferences'])) {
                 $this->auth['preferences'] = $cookie_ary['preferences'];
--- 185,192 ----
           $user_info = $this->get_psluser_info($cookie_ary[1]);
           
!          $user_info = $this->psl_preauth($user_info['author_name'], $user_info['password'], $user_info);
           
           // if the user is not found - apply any preferences
!          if ($user_info == false) {
              if(!empty($cookie_ary['preferences'])) {
                 $this->auth['preferences'] = $cookie_ary['preferences'];
***************
*** 219,228 ****
                 $this->use_preferences(); 
              }
!             // Copy across other options
!             foreach ($temparray as $k => $v) {
!                if (!isset($this->auth[$k])) {
!                   // Make sure we dont overwrite anything that's already there
!                   $this->auth[$k] = $v;
!                   #debug("slashAuth option $k",$v);
                 }
              }
--- 219,230 ----
                 $this->use_preferences(); 
              }
!             if(is_array($temparray)){
!                // Copy across other options
!                foreach ($temparray as $k => $v) {
!                   if (!isset($this->auth[$k])) {
!                      // Make sure we dont overwrite anything that's already there
!                      $this->auth[$k] = $v;
!                      #debug("slashAuth option $k",$v);
!                   }
                 }
              }
***************
*** 860,864 ****
     // dummy method to be overridden in child class
     function psl_preauth($username, $password, $user_info) {
!       return false;
     }
  
--- 862,866 ----
     // dummy method to be overridden in child class
     function psl_preauth($username, $password, $user_info) {
!       return $user_info;
     }