Bug 24663: Remove authnotrequired if set to 0

[koha-ffzg.git] / reports / bor_issues_top.pl

diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl
index 0345a32..a41985b 100755 (executable)
--- a/reports/bor_issues_top.pl
+++ b/reports/bor_issues_top.pl
@@ -17,19 +17,21 @@
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
+
 use CGI qw ( -utf8 );
 use C4::Auth;
 use C4::Output;
 use C4::Context;
-use C4::Branch; # GetBranches
 use C4::Koha;
 use C4::Circulation;
 use C4::Members;
 use C4::Reports;
 use C4::Debug;
+
 use Koha::DateUtils;
+use Koha::ItemTypes;
+use Koha::Patron::Categories;
 
 =head1 NAME
 
@@ -37,12 +39,9 @@ plugin that shows a stats on borrowers
 
 =head1 DESCRIPTION
 
-=over 2
-
 =cut
 
-$debug = 1;
-$debug and open DEBUG, ">/tmp/bor_issues_top.debug.log";
+$debug and open my $debugfh, '>', '/tmp/bor_issues_top.debug.log';
 
 my $input = new CGI;
 my $fullreportname = "reports/bor_issues_top.tt";
@@ -59,11 +58,10 @@ my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => $fullreportname,
                 query => $input,
                 type => "intranet",
-                authnotrequired => 0,
                 flagsrequired => {reports => '*'},
                 debug => 1,
                 });
-our $sep     = $input->param("sep");
+our $sep     = $input->param("sep") || C4::Context->preference('delimiter') || ',';
 $sep = "\t" if ($sep eq 'tabulation');
 $template->param(do_it => $do_it,
         );
@@ -105,46 +103,18 @@ if ($do_it) {
 }
 
 my $dbh = C4::Context->dbh;
-my @values;
 
 # here each element returned by map is a hashref, get it?
 my @mime  = ( map { {type =>$_} } (split /[;:]/, 'CSV') ); # FIXME translation
 my $delims = GetDelimiterChoices;
-my $branches = GetBranches;
-my @branchloop;
-foreach (sort keys %$branches) {
-#      my $selected = 1 if $thisbranch eq $branch;
-       my %row = ( value => $_,
-#                              selected => $selected,
-                               branchname => $branches->{$_}->{branchname},
-                       );
-       push @branchloop, \%row;
-}
 
-my $itemtypes = GetItemTypes;
-my @itemtypeloop;
-foreach (sort {$itemtypes->{$a}->{translated_description} cmp $itemtypes->{$b}->{translated_description}} keys %$itemtypes) {
-       my %row = (value => $_,
-               translated_description => $itemtypes->{$_}->{translated_description},
-              );
-    push @itemtypeloop, \%row;
-}
-    
-my ($codes,$labels) = GetborCatFromCatType(undef,undef);
-my @borcatloop;
-foreach (sort keys %$labels) {
-       my %row =(value => $_,
-              description => $labels->{$_},
-             );
-    push @borcatloop, \%row;
-}
-    
+my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['categorycode']});
+my $itemtypes = Koha::ItemTypes->search_with_localization;
 $template->param(
            mimeloop => \@mime,
          CGIseplist => $delims,
-         branchloop => \@branchloop,
-       itemtypeloop => \@itemtypeloop,
-         borcatloop => \@borcatloop,
+      itemtypes => $itemtypes,
+patron_categories => $patron_categories,
 );
 output_html_with_http_headers $input, $cookie, $template->output;
 
@@ -153,7 +123,6 @@ sub calculate {
     my ($limit, $column, $filters) = @_;
 
     my @loopcol;
-    my @loopline;
     my @looprow;
     my %globalline;
        my %columns;
@@ -254,25 +223,25 @@ sub calculate {
         $strsth2 .=" GROUP BY $colfield";
         $strsth2 .=" ORDER BY $colorder";
 
-        $debug and print DEBUG "bor_issues_top (old_issues) SQL: $strsth2\n";
+        $debug and print $debugfh "bor_issues_top (old_issues) SQL: $strsth2\n";
         my $sth2 = $dbh->prepare($strsth2);
         $sth2->execute;
-        print DEBUG "rows: ", $sth2->rows, "\n";
+        print $debugfh "rows: ", $sth2->rows, "\n";
         while (my @row = $sth2->fetchrow) {
                        $columns{($row[0] ||'NULL')}++;
             push @loopcol, { coltitle => $row[0] || 'NULL' };
         }
 
                $strsth2 =~ s/old_issues/issues/g;
-        $debug and print DEBUG "bor_issues_top (issues) SQL: $strsth2\n";
+        $debug and print $debugfh "bor_issues_top (issues) SQL: $strsth2\n";
                $sth2 = $dbh->prepare($strsth2);
         $sth2->execute;
-        $debug and print DEBUG "rows: ", $sth2->rows, "\n";
+        $debug and print $debugfh "rows: ", $sth2->rows, "\n";
         while (my @row = $sth2->fetchrow) {
                        $columns{($row[0] ||'NULL')}++;
             push @loopcol, { coltitle => $row[0] || 'NULL' };
         }
-               $debug and print DEBUG "full array: ", Dumper(\%columns), "\n";
+        $debug and print $debugfh "full array: ", Dumper(\%columns), "\n";
     }else{
         $columns{''} = 1;
     }
@@ -309,10 +278,10 @@ sub calculate {
     $strcalc .= ",$colfield " if ($colfield);
     $strcalc .= " LIMIT $limit" if ($limit);
 
-    $debug and print DEBUG "(old_issues) SQL : $strcalc\n";
+    $debug and print $debugfh "(old_issues) SQL : $strcalc\n";
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
-    $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
+    $debug and print $debugfh "rows: ", $dbcalc->rows, "\n";
        my %patrons = ();
        # DATA STRUCTURE is going to look like this:
        #       (2253=> {name=>"John Doe",
@@ -331,10 +300,10 @@ sub calculate {
        use Data::Dumper;
 
        $strcalc =~ s/old_issues/issues/g;
-    $debug and print DEBUG "(issues) SQL : $strcalc\n";
+    $debug and print $debugfh "(issues) SQL : $strcalc\n";
     $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
-    $debug and print DEBUG "rows: ", $dbcalc->rows, "\n";
+    $debug and print $debugfh "rows: ", $dbcalc->rows, "\n";
     while (my @data = $dbcalc->fetchrow) {
         my ($row, $rank, $id, $col) = @data;
         $col = "zzEMPTY" if (!defined($col));
@@ -353,7 +322,7 @@ sub calculate {
                        $patrons{$id}->{total} += $count;
                }
        }
-    $debug and print DEBUG "\n\npatrons: ", Dumper(\%patrons);
+    $debug and print $debugfh "\n\npatrons: ", Dumper(\%patrons);
     
        my $i = 1;
        my @cols_in_order = sort keys %columns;         # if you want to order the columns, do something here
@@ -399,6 +368,6 @@ sub calculate {
     return [\%globalline];     # reference to a 1 element array: that element is a hashref
 }
 
-$debug and close DEBUG;
+$debug and close $debugfh;
 1;
 __END__