-$strsth.= " && date_due<'".$todaysdate."' " unless ($showall);
-$strsth.=" && (borrowers.firstname like '".$bornamefilter."%' or borrowers.surname like '".$bornamefilter."%' or borrowers.cardnumber like '".$bornamefilter."%')" if($bornamefilter) ;
-$strsth.=" && borrowers.categorycode = '".$borcatfilter."' " if($borcatfilter) ;
-$strsth.=" && biblioitems.itemtype = '".$itemtypefilter."' " if($itemtypefilter) ;
-$strsth.=" && borrowers.flags = '".$borflagsfilter."' " if ($borflagsfilter ne " ") ;
-$strsth.=" && borrowers.branchcode = '".$branchfilter."' " if($branchfilter) ;
-if ($order eq "borrower"){
- $strsth.=" ORDER BY borrower,date_due " ;
-} elsif ($order eq "title"){
- $strsth.=" ORDER BY title,date_due,borrower ";
-} elsif ($order eq "barcode"){
- $strsth.=" ORDER BY items.barcode,date_due,borrower ";
-}elsif ($order eq "borrower DESC"){
- $strsth.=" ORDER BY borrower desc,date_due " ;
-} elsif ($order eq "title DESC"){
- $strsth.=" ORDER BY title desc,date_due,borrower ";
-} elsif ($order eq "barcode DESC"){
- $strsth.=" ORDER BY items.barcode desc,date_due,borrower ";
-} elsif ($order eq "date_due DESC"){
- $strsth.=" ORDER BY date_due DESC,borrower ";
-} else {
- $strsth.=" ORDER BY date_due,borrower ";
-}
+$strsth.=" AND date_due < '" . $todaysdate . "' " unless ($showall);
+$strsth.=" AND (borrowers.firstname like '".$bornamefilter."%' or borrowers.surname like '".$bornamefilter."%' or borrowers.cardnumber like '".$bornamefilter."%')" if($bornamefilter) ;
+$strsth.=" AND borrowers.categorycode = '" . $borcatfilter . "' " if $borcatfilter;
+$strsth.=" AND biblioitems.itemtype = '" . $itemtypefilter . "' " if $itemtypefilter;
+$strsth.=" AND borrowers.flags = '" . $borflagsfilter . "' " if $borflagsfilter;
+$strsth.=" AND borrowers.branchcode = '" . $branchfilter . "' " if $branchfilter;
+$strsth.=" ORDER BY " . (
+ ($order eq "borrower" or $order eq "borrower desc") ? "$order, date_due" :
+ ($order eq "title" or $order eq "title desc") ? "$order, date_due, borrower" :
+ ($order eq "barcode" or $order eq "barcode desc") ? "items.$order, date_due, borrower" :
+ ($order eq "date_due desc") ? "date_due DESC, borrower" :
+ "date_due, borrower" # default sort order
+);
+$template->param(sql=>$strsth);