[Koha-cvs] CVS: koha/circ circulation.pl,1.23.2.1,1.23.2.2 circulation2.pl,1.1,1.1.2.1

[Steve Tonnesen]

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

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


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -C2 -r1.23.2.1 -r1.23.2.2
*** circulation.pl	24 Jun 2002 22:12:22 -0000	1.23.2.1
--- circulation.pl	11 Jul 2002 18:05:29 -0000	1.23.2.2
***************
*** 6,10 ****
--- 6,13 ----
  use C4::Print;
  use DBI;
+ use C4::Auth;
  
+ my $query=new CGI;
+ my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($query);
  
  my %env;
***************
*** 15,19 ****
  my $linecolor2='white';
  my $backgroundimage="/images/background-mem.gif";
- my $query=new CGI;
  my $branches=getbranches(\%env);
  my $printers=getprinters(\%env);
--- 18,21 ----
***************
*** 71,75 ****
  my $printercookie=$query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
  
! print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]);
  #print $query->dump;
  print startpage();
--- 73,77 ----
  my $printercookie=$query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y');
  
! print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie,$sessioncookie]);
  #print $query->dump;
  print startpage();
***************
*** 84,87 ****
--- 86,90 ----
  }
  print @inp;
+ print "<p align=left>Logged in as: $loggedinuser [<a href=/cgi-bin/koha/logout.pl>Log Out</a>]</p>\n";
  
  print <<EOF
***************
*** 823,827 ****
  <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Enter borrower card number<br> or partial last name</b></font></td></tr>
! <tr><td><input name=findborrower></td></tr>
  </table>
  <input type=hidden name=module value=issues>
--- 826,830 ----
  <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd>
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Enter borrower card number<br> or partial last name</b></font></td></tr>
! <tr><td><input name=findborrower> <input type=submit value=Go></td></tr>
  </table>
  <input type=hidden name=module value=issues>

Index: circulation2.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation2.pl,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -C2 -r1.1 -r1.1.2.1
*** circulation2.pl	14 Mar 2002 01:04:00 -0000	1.1
--- circulation2.pl	11 Jul 2002 18:05:29 -0000	1.1.2.1
***************
*** 7,10 ****
--- 7,11 ----
  use C4::Print;
  use DBI;
+ use C4::Auth;
  
  
***************
*** 12,15 ****
--- 13,19 ----
  # dividing it up into three scripts......
  # this will be the first one that chooses branch and printer settings....
+ my $query=new CGI;
+ my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($query);
+ 
  
  my %env;
***************
*** 21,25 ****
  my $backgroundimage="/images/background-mem.gif";
  
- my $query=new CGI;
  my $branches=getbranches(\%env);
  my $printers=getprinters(\%env);
--- 25,28 ----
***************
*** 108,116 ****
  
  # set header with cookie....
! print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]);
  
  
  print startpage();
  print startmenu('circulation');
  
  if ($branch and $printer) {
--- 111,120 ----
  
  # set header with cookie....
! print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie,$sessioncookie]);
  
  
  print startpage();
  print startmenu('circulation');
+ print "<p align=left>Logged in as: $loggedinuser [<a href=logout.pl>Log Out</a>]</p>\n";
  
  if ($branch and $printer) {