Bug 31378: (follow-up) Wrong permissions on controller script file

[srvgit] / reports / serials_stats.pl

diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl
index f6ba4c0..c625424 100755 (executable)
--- a/reports/serials_stats.pl
+++ b/reports/serials_stats.pl
@@ -17,16 +17,13 @@
 # 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;
-use C4::Auth;
+use Modern::Perl;
+use C4::Auth qw( get_template_and_user );
 use CGI qw ( -utf8 );
 use C4::Context;
-use C4::Branch; # GetBranches
-use C4::Output;
-use C4::Koha;
-use C4::Reports;
-use C4::Serials;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Reports qw( GetDelimiterChoices );
+use C4::Serials qw( GetExpirationDate HasSubscriptionExpired );
 
 =head1 serials_out
 
@@ -36,7 +33,7 @@ plugin that shows a stats on serials
 
 =cut
 
-my $input      = new CGI;
+my $input      = CGI->new;
 my $templatename   = "reports/serials_stats.tt";
 my $do_it      = $input->param("do_it");
 my $bookseller = $input->param("bookseller");
@@ -45,16 +42,13 @@ my $expired    = $input->param("expired");
 my $order      = $input->param("order");
 my $output     = $input->param("output");
 my $basename   = $input->param("basename");
-our $sep       = $input->param("sep") || '';
-$sep = "\t" if ($sep eq 'tabulation');
+our $sep       = C4::Context->csv_delimiter(scalar $input->param("sep"));
 
 my ($template, $borrowernumber, $cookie)
        = get_template_and_user({template_name => $templatename,
                                query => $input,
                                type => "intranet",
-                               authnotrequired => 0,
                                flagsrequired => {reports => '*'},
-                               debug => 1,
                                });
                                
                                
@@ -140,7 +134,9 @@ if($do_it){
     my $sth = $dbh->prepare("SELECT aqbooksellerid, aqbooksellers.name 
                                 FROM subscription 
                                   LEFT JOIN aqbooksellers ON (subscription.aqbooksellerid=aqbooksellers.id ) 
-                                GROUP BY aqbooksellerid");
+                                GROUP BY aqbooksellerid, aqbooksellers.name
+                                ORDER BY aqbooksellers.name ASC
+                               ");
     $sth->execute();
     
     while(my $row = $sth->fetchrow_hashref){
@@ -153,7 +149,7 @@ if($do_it){
                CGIextChoice => $CGIextChoice,
                CGIsepChoice => $CGIsepChoice,
         booksellers  => \@booksellers,
-        branches     => GetBranchesLoop(C4::Context->userenv->{'branch'}));
+    );
 }
 
 output_html_with_http_headers $input, $cookie, $template->output;