[Koha-cvs] CVS: koha/opac opac-detail.pl,1.4,1.5 opac-main.pl,1.2,1.3 opac-search.pl,1.3,1.4 opac-searchresults.pl,1.4,1.5 opac-user.pl,1.3,1.4 opac-userupdate.pl,1.3,1.4

[Steve Tonnesen]

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

Modified Files:
        opac-detail.pl opac-main.pl opac-search.pl 
        opac-searchresults.pl opac-user.pl opac-userupdate.pl 
Log Message:
Merging from rel-1-2 to trunk


Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-detail.pl      13 Oct 2002 10:45:42 -0000      1.4
--- opac-detail.pl      28 Oct 2002 20:03:02 -0000      1.5
***************
*** 9,13 ****
  my $query=new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  my $template = gettemplate ("opac-detail.tmpl", "opac");
--- 9,18 ----
  my $query=new CGI;
  
! 
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
! 
  
  my $template = gettemplate ("opac-detail.tmpl", "opac");
***************
*** 16,19 ****
--- 21,25 ----
  
  my $biblionumber=$query->param('bib');
+ $template->param(biblionumber => $biblionumber);
  
  
***************
*** 31,34 ****
--- 37,49 ----
          $dat->{'additional'} .= "|" . $addauthor->[$i]->{'author'};
  } # for
+ 
+ my $norequests = 1;
+ foreach my $itm (@items) {
+     $norequests = 0 unless $itm->{'notforloan'};
+ }
+ 
+ $template->param(norequests => $norequests);
+ 
+ 
  
  my @results;

Index: opac-main.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-main.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-main.pl        3 Oct 2002 08:51:29 -0000       1.2
--- opac-main.pl        28 Oct 2002 20:03:05 -0000      1.3
***************
*** 9,13 ****
  my $query = new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  my $template = gettemplate("opac-main.tmpl", "opac");
--- 9,17 ----
  my $query = new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
! 
  
  my $template = gettemplate("opac-main.tmpl", "opac");

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-search.pl      13 Oct 2002 10:46:06 -0000      1.3
--- opac-search.pl      28 Oct 2002 20:03:08 -0000      1.4
***************
*** 8,12 ****
  
  my $query = new CGI;
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query ,1);
  
  my $template = gettemplate("opac-search.tmpl", "opac");
--- 8,16 ----
  
  my $query = new CGI;
! 
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query ,1, 
$flagsrequired);
  
  my $template = gettemplate("opac-search.tmpl", "opac");

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-searchresults.pl       13 Oct 2002 10:46:14 -0000      1.4
--- opac-searchresults.pl       28 Oct 2002 20:03:09 -0000      1.5
***************
*** 9,13 ****
  my $query=new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1);
  
  
--- 9,16 ----
  my $query=new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 1, 
$flagsrequired);
  
  
***************
*** 60,65 ****
  my $subjectitems=$query->param('subjectitems');
  if ($subjectitems) {
!     my $blah;
!     @results = subsearch(\$blah,$subjectitems, $num, $startfrom);
      $count = $#results+1;
  } else {
--- 63,67 ----
  my $subjectitems=$query->param('subjectitems');
  if ($subjectitems) {
!     @results = subsearch($env,$subjectitems, $num, $startfrom);
      $count = $#results+1;
  } else {

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-user.pl        13 Oct 2002 10:46:22 -0000      1.3
--- opac-user.pl        28 Oct 2002 20:03:09 -0000      1.4
***************
*** 4,8 ****
  use CGI;
  
- use C4::Search;       # borrdata
  use C4::Output;       # gettemplate
  use C4::Auth;         # checkauth, getborrowernumber.
--- 4,7 ----
***************
*** 13,17 ****
  my $query = new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  my $template = gettemplate("opac-user.tmpl", "opac");
--- 12,19 ----
  my $query = new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, 
$flagsrequired);
  
  my $template = gettemplate("opac-user.tmpl", "opac");
***************
*** 28,33 ****
  if ($borr->{'amountoutstanding'} > 5) {
      $borr->{'amountoverfive'} = 1;
! } else {
!     $borr->{'amountoverfive'} = 0;
  }
  
--- 30,40 ----
  if ($borr->{'amountoutstanding'} > 5) {
      $borr->{'amountoverfive'} = 1;
! }
! if (5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
!     $borr->{'amountoverzero'} = 1;
! }
! if ($borr->{'amountoutstanding'} < 0) {
!     $borr->{'amountlessthanzero'} = 1;
!     $borr->{'amountoutstanding'} = -1*($borr->{'amountoutstanding'});
  }
  
***************
*** 48,52 ****
      $issue->{'date_due'}  = slashifyDate($issue->{'date_due'});
      if ($issue->{'overdue'}) {
!       $issue->{'status'} = "OVERDUE";
      } else {
        $issue->{'status'} = "Issued";
--- 55,59 ----
      $issue->{'date_due'}  = slashifyDate($issue->{'date_due'});
      if ($issue->{'overdue'}) {
!       $issue->{'status'} = "<font color='red'>OVERDUE</font>";
      } else {
        $issue->{'status'} = "Issued";
***************
*** 55,59 ****
      my ($restype, $res) = CheckReserves($issue->{'itemnumber'});
      if ($restype) {
!       $issue->{'status'} .= "Reserved";
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
--- 62,66 ----
      my ($restype, $res) = CheckReserves($issue->{'itemnumber'});
      if ($restype) {
!       $issue->{'status'} .= " Reserved";
      }
      my ($charges, $itemtype) = calc_charges(undef, undef, 
$issue->{'itemnumber'}, $borrowernumber);
***************
*** 68,71 ****
--- 75,81 ----
  # now the reserved items....
  my ($rcount, $reserves) = FindReserves(undef, $borrowernumber);
+ foreach my $res (@$reserves) {
+     $res->{'reservedate'}  = slashifyDate($res->{'reservedate'});
+ }
  
  $template->param(RESERVES => $reserves);

Index: opac-userupdate.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userupdate.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-userupdate.pl  13 Oct 2002 10:46:30 -0000      1.3
--- opac-userupdate.pl  28 Oct 2002 20:03:10 -0000      1.4
***************
*** 13,17 ****
  my $query = new CGI;
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  # get borrower information ....
--- 13,20 ----
  my $query = new CGI;
  
! my $flagsrequired;
! $flagsrequired->{borrow}=1;
! 
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, 0, 
$flagsrequired);
  
  # get borrower information ....