[Koha-cvs] CVS: koha/acqui.simple addbooks.pl,1.5.2.5,1.5.2.6 marcimport.pl,1.6.2.34,1.6.2.35

[Steve Tonnesen]

Update of /cvsroot/koha/koha/acqui.simple
In directory usw-pr-cvs1:/tmp/cvs-serv25579/acqui.simple

Modified Files:
      Tag: rel-1-2
	addbooks.pl marcimport.pl 
Log Message:
Committing changes to add authentication and opac templating to rel-1-2 branch


Index: addbooks.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/addbooks.pl,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -C2 -r1.5.2.5 -r1.5.2.6
*** addbooks.pl	3 Jul 2002 05:04:42 -0000	1.5.2.5
--- addbooks.pl	11 Jul 2002 18:05:29 -0000	1.5.2.6
***************
*** 21,26 ****
--- 21,30 ----
  use C4::Output;
  use C4::Circulation::Circ2;
+ use C4::Auth;
  
  my $input = new CGI;
+ my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($input);
+ 
+ 
  my $dbh=C4Connect;
  
***************
*** 29,35 ****
  my $biblioitemnumber;
  
! print $input->header;
  print startpage();
  print startmenu('acquisitions');
  
  ($input->param('checkforbiblio')) && (checkforbiblio());
--- 33,41 ----
  my $biblioitemnumber;
  
! print $input->header(-cookie=>$sessioncookie);
  print startpage();
  print startmenu('acquisitions');
+ print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
+ 
  
  ($input->param('checkforbiblio')) && (checkforbiblio());

Index: marcimport.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui.simple/marcimport.pl,v
retrieving revision 1.6.2.34
retrieving revision 1.6.2.35
diff -C2 -r1.6.2.34 -r1.6.2.35
*** marcimport.pl	5 Jul 2002 19:30:14 -0000	1.6.2.34
--- marcimport.pl	11 Jul 2002 18:05:29 -0000	1.6.2.35
***************
*** 24,29 ****
--- 24,31 ----
  use C4::SimpleMarc;
  use C4::Z3950;
+ use C4::Auth;
  
  my $input = new CGI;
+ my ($loggedinuser, $cookie, $sessionID) = checkauth($input);
  
  #------------------
***************
*** 44,51 ****
  #-------------
  # Display output
! print $input->header();
  print startpage();
  print startmenu('acquisitions');
  
  
  #-------------
--- 46,54 ----
  #-------------
  # Display output
! print $input->header(-cookie => $cookie);
  print startpage();
  print startmenu('acquisitions');
  
+ print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
  #-------------
***************
*** 1147,1150 ****
--- 1150,1156 ----
  #---------------
  # $Log$
+ # Revision 1.6.2.35  2002/07/11 18:05:29  tonnesen
+ # Committing changes to add authentication and opac templating to rel-1-2 branch
+ #
  # Revision 1.6.2.34  2002/07/05 19:30:14  amillar
  # Second arg of requireDBI is calling subroutine name