[Koha-cvs] CVS: koha/circ branchtransfers.pl,1.18,1.19 circulation.pl,1.47,1.48 returns.pl,1.27,1.28 selectbranchprinter.pl,1.9,1.10

[Ambrose Li]

Update of /cvsroot/koha/koha/circ
In directory sc8-pr-cvs1:/tmp/cvs-serv3907/circ

Modified Files:
        branchtransfers.pl circulation.pl returns.pl 
        selectbranchprinter.pl 
Log Message:
Make sure flagsrequired is *circulate* not parameters


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** branchtransfers.pl  5 Feb 2003 09:07:09 -0000       1.18
--- branchtransfers.pl  6 Feb 2003 05:10:54 -0000       1.19
***************
*** 252,256 ****
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {parameters => 1},
                           });
  $template->param(     genbrname => $genbrname,
--- 252,256 ----
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {circulate => 1},
                           });
  $template->param(     genbrname => $genbrname,

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -r1.47 -r1.48
*** circulation.pl      5 Feb 2003 06:28:58 -0000       1.47
--- circulation.pl      6 Feb 2003 05:10:54 -0000       1.48
***************
*** 31,43 ****
  use DBI;
  use C4::Auth;
  
  my $query=new CGI;
! my ($loggedinuser, $sessioncookie, $sessionID) = checkauth($query);
  
  
  my %env;
  my $headerbackgroundcolor='#99cc33';
- my $circbackgroundcolor='#ffffcc';    # FIXME - Never used
- my $circbackgroundcolor='white';      # FIXME - Never used
  my $linecolor1='#ffffcc';
  my $linecolor2='white';
--- 31,52 ----
  use DBI;
  use C4::Auth;
+ use C4::Interface::CGI::Output;
  
  my $query=new CGI;
! my ($loggedinuser, $sessioncookie, $sessionID) = checkauth
!       ($query, 0, { circulate => 1 });
! 
! #my ($template, $loggedinuser, $sessioncookie) = get_template_and_user
! #    ({
! #     template_name   => 'circ/circulation.tmpl',
! #     query           => $query,
! #     type            => "intranet",
! #     authnotrequired => 0,
! #     flagsrequired   => { circulate => 1 },
! #    });
  
  
  my %env;
  my $headerbackgroundcolor='#99cc33';
  my $linecolor1='#ffffcc';
  my $linecolor2='white';
***************
*** 47,52 ****
  my $printers = getprinters(\%env);
  
- my $query = new CGI;
- 
  my $branch = getbranch($query, $branches);
  my $printer = getprinter($query, $printers);
--- 56,59 ----
***************
*** 67,72 ****
  
  my @datearr = localtime(time());
- my $tday = localtime(time());         # FIXME - Unused
- #warn "today: $tday \n";
  # FIXME - Could just use POSIX::strftime("%Y%m%d", localtime);
  my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", 
($datearr[4]+1)).sprintf ("%0.2d", ($datearr[3]));
--- 74,77 ----

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** returns.pl  5 Feb 2003 07:57:56 -0000       1.27
--- returns.pl  6 Feb 2003 05:10:55 -0000       1.28
***************
*** 44,48 ****
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {parameters => 1},
                           });
  
--- 44,48 ----
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {circulate => 1},
                           });
  

Index: selectbranchprinter.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/selectbranchprinter.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** selectbranchprinter.pl      5 Feb 2003 09:07:09 -0000       1.9
--- selectbranchprinter.pl      6 Feb 2003 05:10:55 -0000       1.10
***************
*** 120,124 ****
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {parameters => 1},
                           });
  $template->param(headerbackgroundcolor => $headerbackgroundcolor,
--- 120,124 ----
                              type => "intranet",
                              authnotrequired => 0,
!                             flagsrequired => {circulate => 1},
                           });
  $template->param(headerbackgroundcolor => $headerbackgroundcolor,