[Koha-cvs] CVS: koha logout.pl,1.4,1.5 userpage.pl,1.6,1.7

[Paul POULAIN]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv18173

Modified Files:
        logout.pl userpage.pl 
Log Message:
merging 1.2 and bugfixes for auth and login

Index: logout.pl
===================================================================
RCS file: /cvsroot/koha/koha/logout.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** logout.pl   5 Oct 2002 09:45:46 -0000       1.4
--- logout.pl   10 Oct 2002 10:07:34 -0000      1.5
***************
*** 70,84 ****
  # Should redirect to intranet home page after logging out
  
! print $query->redirect("mainpage.pl");
! 
  exit;
- if ($sessionID) {
-     print "Logged out of $sessionID<br>\n";
-     print "<a href=shelves.pl>Login</a>";
- } else {
-     print "Not logged in.<br>\n";
-     print "<a href=shelves.pl>Login</a>";
- }
- 
  
  
--- 70,75 ----
  # Should redirect to intranet home page after logging out
  
! print $query->redirect("userpage.pl");
  exit;
  
  

Index: userpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/userpage.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** userpage.pl 9 Oct 2002 18:09:16 -0000       1.6
--- userpage.pl 10 Oct 2002 10:07:34 -0000      1.7
***************
*** 28,32 ****
  
  my $query=new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  my $template = gettemplate("user/userpage.tmpl",0);
--- 28,32 ----
  
  my $query=new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0);
  
  my $template = gettemplate("user/userpage.tmpl",0);