Bugzilla – Attachment 4885 Details for
Bug 6679
Fixing code so it passes basic Perl::Critic tests
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6679: More style errors, plus fixing a security issue
Bug-6679-More-style-errors-plus-fixing-a-security-.patch (text/plain), 2.25 KB, created by
Chris Cormack
on 2011-08-08 09:01:09 UTC
(
hide
)
Description:
Bug 6679: More style errors, plus fixing a security issue
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-08-08 09:01:09 UTC
Size:
2.25 KB
patch
obsolete
>From 5bd668012bf7e29327ab3af33387d60374283cd5 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >Date: Mon, 8 Aug 2011 20:59:44 +1200 >Subject: [PATCH] Bug 6679: More style errors, plus fixing a security issue > >--- > acqui/basketgroup.pl | 35 ++++++++++++++++++++++++++++++----- > 1 files changed, 30 insertions(+), 5 deletions(-) > >diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl >index 08356f8..e1622ee 100755 >--- a/acqui/basketgroup.pl >+++ b/acqui/basketgroup.pl >@@ -184,9 +184,21 @@ sub printbasketgrouppdf{ > my ($basketgroupid) = @_; > > my $pdfformat = C4::Context->preference("OrderPdfFormat"); >- eval "use $pdfformat"; >- # FIXME consider what would happen if $pdfformat does not >- # contain the name of a valid Perl module. >+ if ($pdfformat eq 'pdfformat::layout3pages' || $pdfformat eq 'pdfformat::layout2pages'){ >+ eval { >+ require $pdfformat; >+ import $pdfformat; >+ }; >+ if ($@){ >+ } >+ } >+ else { >+ print $input->header; >+ print $input->start_html; # FIXME Should do a nicer page >+ print "<h1>Invalid PDF Format set</h1>"; >+ print "Please go to the systempreferences and set a valid pdfformat"; >+ exit; >+ } > > my $basketgroup = GetBasketgroup($basketgroupid); > my $bookseller = GetBookSellerFromId($basketgroup->{'booksellerid'}); >@@ -202,8 +214,20 @@ sub printbasketgrouppdf{ > #isbn, itemtype, author, title, publishercode, quantity, listprice ecost discount gstrate > my @ba_order; > if ( $ord->{biblionumber} && $ord->{quantity}> 0 ) { >- eval "use C4::Biblio"; >- eval "use C4::Koha"; >+ eval { >+ require C4::Biblio; >+ import C4::Biblio; >+ }; >+ if ($@){ >+ croak $@; >+ } >+ eval { >+ require C4::Koha; >+ import C4::Koha; >+ }; >+ if ($@){ >+ croak $@; >+ } > my $bib = GetBiblioData($ord->{biblionumber}); > my $itemtypes = GetItemTypes(); > if($ord->{isbn}){ >@@ -246,6 +270,7 @@ sub printbasketgrouppdf{ > ); > my $pdf = printpdf($basketgroup, $bookseller, $baskets, \%orders, $bookseller->{gstrate} // C4::Context->preference("gist")) || die "pdf generation failed"; > print $pdf; >+ > } > > my $op = $input->param('op'); >-- >1.7.4.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6679
:
4883
|
4884
|
4885
|
4886
|
4887
|
4888
|
5445
|
5446
|
5483
|
5487
|
6121
|
6122
|
6123
|
6139
|
6140
|
6141
|
6142
|
6143
|
6144
|
6270
|
6271
|
6663
|
6670
|
6675
|
6676
|
6677
|
6678
|
8542
|
8897
|
8898
|
8899
|
8950
|
8951
|
9746
|
9747
|
9748
|
9749
|
9750
|
10050
|
10051
|
10052
|
10053
|
10054
|
10075
|
10076
|
10077
|
10078
|
10079
|
10484
|
10485
|
10486
|
10487
|
10488
|
10489
|
10491
|
10492
|
10493
|
10494
|
10495
|
10496
|
10497
|
10499
|
10500
|
10501
|
10502
|
10503
|
10504
|
10505
|
10506
|
10507
|
10508
|
10509
|
10510
|
10512
|
10513
|
10514
|
10515
|
10517
|
10521
|
10522
|
10523
|
10524
|
10525
|
10526
|
10527
|
10935
|
10936
|
10938
|
10940
|
10944
|
10945
|
10946
|
10947
|
10948
|
10949
|
10950
|
10952
|
10953
|
10955
|
10957
|
10958
|
10959
|
10960
|
10961
|
10962
|
10963
|
10964
|
10965
|
10966
|
10967
|
10972
|
10976
|
10979
|
10980
|
10981
|
12224
|
12363
|
12490
|
12491
|
12492
|
34191
|
34192
|
34193
|
34194
|
34195
|
34196
|
34197
|
39100
|
39101
|
39102
|
39392
|
39393
|
39394
|
39395
|
39396
|
39397
|
39398
|
42770
|
47086
|
47087
|
47088
|
47089
|
47090
|
47178
|
47179
|
47180
|
47181
|
47205
|
47206
|
47207
|
47208