[Koha-cvs] CVS: koha/C4 Auth.pm,1.9.2.16,1.9.2.17

[Finlay Thompson]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv30270/C4

Modified Files:
      Tag: rel-1-2
	Auth.pm 
Log Message:

Fixed a bug in the Auth.pm


Index: Auth.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Auth.pm,v
retrieving revision 1.9.2.16
retrieving revision 1.9.2.17
diff -C2 -r1.9.2.16 -r1.9.2.17
*** Auth.pm	14 Nov 2002 22:17:21 -0000	1.9.2.16
--- Auth.pm	27 Nov 2002 00:03:07 -0000	1.9.2.17
***************
*** 171,175 ****
  	}
      }
!     unless ($sessionID) {
  	$sessionID=int(rand()*100000).'-'.time();
  	$userid=$query->param('userid');
--- 171,175 ----
  	}
      }
!     unless ($userid) {
  	$sessionID=int(rand()*100000).'-'.time();
  	$userid=$query->param('userid');
***************
*** 195,199 ****
  	} else {
  	    if ($userid) {
! 		$info{'invalid_username_or_password'};
  	    }
  	}
--- 195,199 ----
  	} else {
  	    if ($userid) {
! 		$info{'invalid_username_or_password'} = 1;
  	    }
  	}
***************
*** 212,216 ****
      # else we have a problem...
      # get the inputs from the incoming query
!     my @inputs;
      foreach my $name (param $query) {
  	(next) if ($name eq 'userid' || $name eq 'password');
--- 212,216 ----
      # else we have a problem...
      # get the inputs from the incoming query
!     my @inputs =();
      foreach my $name (param $query) {
  	(next) if ($name eq 'userid' || $name eq 'password');
***************
*** 218,222 ****
  	push @inputs, {name => $name , value => $value};
      }
-     @inputs = () unless @inputs;
  
      my $template = gettemplate("opac-auth.tmpl", "opac");
--- 218,221 ----
***************
*** 224,231 ****
      $template->param(loginprompt => 1) unless $info{'nopermission'};
  
!     my $self_url = $query->self_url();
      # Strip userid and password parameters off the self_url variable
!     $self_url=~s/\?*userid=[^;]*;*//g;
!     $self_url=~s/\?*password=[^;]*;*//g;    
      $template->param(url => $self_url);
  
--- 223,230 ----
      $template->param(loginprompt => 1) unless $info{'nopermission'};
  
!     my $self_url = $query->url(-absolute => 1);
      # Strip userid and password parameters off the self_url variable
! #    $self_url=~s/\?*userid=[^;]*;*//g;
! #    $self_url=~s/\?*password=[^;]*;*//g;    
      $template->param(url => $self_url);