From bfad2384758f5e6f03b59a09cf7fa2258bb47ee5 Mon Sep 17 00:00:00 2001 From: Colin Campbell Date: Wed, 16 Sep 2009 12:18:11 +0100 Subject: [PATCH] Ensure op is defined in serials scripts Set $op to an empty string if no value passed otherwise the error-log fills with warnings on comparison --- serials/serials-collection.pl | 3 +-- serials/serials-recieve.pl | 2 +- serials/statecollection.pl | 2 +- serials/subscription-bib-search.pl | 2 +- serials/subscription-detail.pl | 4 ++-- serials/subscription-renew.pl | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index c80886b3c0..b6ee0e1ac8 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -31,7 +31,7 @@ use C4::Context; my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; my $sth; @@ -51,7 +51,6 @@ my @subscriptionid = $query->param('subscriptionid'); my $subscriptiondescs ; my $subscriptions; -$op ||= q{}; if($op eq 'gennext' && @subscriptionid){ my $subscriptionid = $subscriptionid[0]; my $subscription = GetSubscription($subscriptionid); diff --git a/serials/serials-recieve.pl b/serials/serials-recieve.pl index 89e86be052..6df5b94b5b 100755 --- a/serials/serials-recieve.pl +++ b/serials/serials-recieve.pl @@ -75,7 +75,7 @@ use C4::Serials; use C4::Branch; # GetBranches my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; my $subscriptionid = $query->param('subscriptionid'); # my $auser = $query->param('user'); diff --git a/serials/statecollection.pl b/serials/statecollection.pl index 715260a3c1..7e4036959b 100755 --- a/serials/statecollection.pl +++ b/serials/statecollection.pl @@ -25,7 +25,7 @@ use C4::Context; use C4::Serials; my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; my $subscriptionid = $query->param('subscriptionid'); my $auser = $query->param('user'); diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl index fc70f09f94..4630e9b15f 100755 --- a/serials/subscription-bib-search.pl +++ b/serials/subscription-bib-search.pl @@ -60,7 +60,7 @@ use C4::Biblio; my $input=new CGI; # my $type=$query->param('type'); -my $op = $input->param('op'); +my $op = $input->param('op') || q{}; my $dbh = C4::Context->dbh; my $startfrom=$input->param('startfrom'); diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl index 131fdefc98..fbadcaf0ee 100755 --- a/serials/subscription-detail.pl +++ b/serials/subscription-detail.pl @@ -28,7 +28,7 @@ use Date::Calc qw/Today Day_of_Year Week_of_Year Add_Delta_Days/; use Carp; my $query = new CGI; -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $dbh = C4::Context->dbh; my ($template, $loggedinuser, $cookie, $hemisphere); my $subscriptionid = $query->param('subscriptionid'); @@ -36,7 +36,7 @@ my $subs = GetSubscription($subscriptionid); $subs->{enddate} = GetExpirationDate($subscriptionid); -if ($op && $op eq 'del') { +if ( $op eq 'del') { if ($subs->{'cannotedit'}){ carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed"; print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid"); diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl index 7402af70d6..f92ee37bf4 100755 --- a/serials/subscription-renew.pl +++ b/serials/subscription-renew.pl @@ -59,7 +59,7 @@ my $query = new CGI; my $dbh = C4::Context->dbh; my $mode = $query->param('mode'); -my $op = $query->param('op'); +my $op = $query->param('op') || q{}; my $subscriptionid = $query->param('subscriptionid'); my $done = 0; # for after form has been submitted my ( $template, $loggedinuser, $cookie ) = get_template_and_user( -- 2.20.1