Bug 9454: Use placeholders when adding basket

[koha_fer] / opac / opac-user.pl

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 1c942d5..c5a7f5a 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -125,24 +125,26 @@ my @bordat;
 $bordat[0] = $borr;
 
 # Warningdate is the date that the warning starts appearing
-if ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
-    Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
-    Date_to_Days( $today_year, $today_month, $today_day ) )
-{
-    # borrower card soon to expire, warn the borrower
-    $borr->{'warndeparture'} = $borr->{dateexpiry};
-    if (C4::Context->preference('ReturnBeforeExpiry')){
-        $borr->{'returnbeforeexpiry'} = 1;
-    }
+if ( $borr->{dateexpiry} && Date_to_Days( $today_year, $today_month, $today_day ) > Date_to_Days( $warning_year, $warning_month, $warning_day ) ) {
+    $borr->{'warnexpired'} = 1;
+}
+elsif ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
+        Date_to_Days(Add_Delta_Days($warning_year, $warning_month, $warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
+        Date_to_Days( $today_year, $today_month, $today_day ) ) {
+        # borrower card soon to expire, warn the borrower
+        $borr->{'warndeparture'} = $borr->{dateexpiry};
+        if (C4::Context->preference('ReturnBeforeExpiry')){
+            $borr->{'returnbeforeexpiry'} = 1;
+        }
 }
 
+
 $template->param(   BORROWER_INFO     => \@bordat,
                     borrowernumber    => $borrowernumber,
                     patron_flagged    => $borr->{flagged},
                     OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
                     surname           => $borr->{surname},
                     showname          => $borr->{showname},
-
                 );
 
 #get issued items ....
@@ -173,11 +175,6 @@ if ($issues){
         }
         $issue->{'charges'} = $charges;
 
-        # get publictype for icon
-
-        my $publictype = $issue->{'publictype'};
-        $issue->{$publictype} = 1;
-
         # check if item is renewable
         my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
         ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
@@ -258,8 +255,6 @@ foreach my $res (@reserves) {
       $res->{'expirationdate'} = '';
     }
 
-    my $publictype = $res->{'publictype'};
-    $res->{$publictype} = 1;
     $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
@@ -362,10 +357,8 @@ $template->param(
     patronupdate => $patronupdate,
     OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
     userview => 1,
-    dateformat    => C4::Context->preference("dateformat"),
 );
 
-$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
 $template->param(
     SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
     AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),