[Koha-patches] [PATCH 1/6] Bug 5453: Move declarations out of conditionals
Colin Campbell
colin.campbell at ptfs-europe.com
Mon Nov 29 18:58:23 CET 2010
Patch admin/*.pl scripts
---
admin/aqbudgets.pl | 6 +++++-
admin/aqcontract.pl | 32 ++++++++++++++++++++++----------
admin/auth_tag_structure.pl | 17 ++++++++---------
admin/branches.pl | 8 +++-----
admin/smart-rules.pl | 13 ++++++-------
5 files changed, 44 insertions(+), 32 deletions(-)
diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl
index d266727..6f66773 100755
--- a/admin/aqbudgets.pl
+++ b/admin/aqbudgets.pl
@@ -325,7 +325,11 @@ if ($op eq 'add_form') {
);
}
- my $budget_period_total = $num->format_price($$period{budget_period_total}) if $$period{budget_period_total};
+ my $budget_period_total;
+ if ( $period->{budget_period_total} ) {
+ $budget_period_total =
+ $num->format_price( $period->{budget_period_total} );
+ }
$template->param(
else => 1,
budget => \@loop,
diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl
index 07fb757..7126c99 100755
--- a/admin/aqcontract.pl
+++ b/admin/aqcontract.pl
@@ -59,17 +59,29 @@ $template->param(
if ( $op eq 'add_form' ) {
$template->param( add_form => 1 );
- # if contractnumber exists, it's a modify action, so read values to modify...
- my $contract = @{GetContract( { contractnumber => $contractnumber } )}[0] if $contractnumber;
-
- $template->param(
- contractnumber => $$contract{contractnumber},
- contractname => $$contract{contractname},
- contractdescription => $$contract{contractdescription},
- contractstartdate => format_date( $$contract{contractstartdate} ),
- contractenddate => format_date( $$contract{contractenddate} ),
- DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
- );
+ # if contractnumber exists, it's a modify action, so read values to modify...
+ if ($contractnumber) {
+ my $contract =
+ @{ GetContract( { contractnumber => $contractnumber } ) }[0];
+
+ $template->param(
+ contractnumber => $contract->{contractnumber},
+ contractname => $contract->{contractname},
+ contractdescription => $contract->{contractdescription},
+ contractstartdate => format_date( $contract->{contractstartdate} ),
+ contractenddate => format_date( $contract->{contractenddate} ),
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
+ );
+ } else {
+ $template->param(
+ contractnumber => undef,
+ contractname => undef,
+ contractdescription => undef,
+ contractstartdate => undef,
+ contractenddate => undef,
+ DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar,
+ );
+ }
# END $OP eq ADD_FORM
}
diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl
index 6314c0a..fd7c1b9 100755
--- a/admin/auth_tag_structure.pl
+++ b/admin/auth_tag_structure.pl
@@ -55,15 +55,14 @@ my ($template, $loggedinuser, $cookie)
});
# get authtype list
-my $authtypes = getauthtypes;
-my @authtypesloop;
-foreach my $thisauthtype (keys %$authtypes) {
- my $selected = 1 if $thisauthtype eq $authtypecode;
- my %row =(value => $thisauthtype,
- selected => $selected,
- authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
- );
- push @authtypesloop, \%row;
+my $authtypes = getauthtypes;
+my @authtypesloop = ();
+foreach my $thisauthtype ( keys %{$authtypes} ) {
+ push @authtypesloop,
+ { value => $thisauthtype,
+ selected => $thisauthtype eq $authtypecode,
+ authtypetext => $authtypes->{$thisauthtype}->{'authtypetext'},
+ };
}
my $sth;
diff --git a/admin/branches.pl b/admin/branches.pl
index 758fa32..a97a91b 100755
--- a/admin/branches.pl
+++ b/admin/branches.pl
@@ -189,12 +189,10 @@ elsif ( $op eq 'addcategory_validate' ) {
elsif ( $op eq 'delete_category' ) {
# if the user has pressed the "delete branch" button.
- my $message = "MESSAGE8" if CheckBranchCategorycode($categorycode);
- if ($message) {
+ if ( CheckBranchCategorycode($categorycode) ) {
$template->param( else => 1 );
- default($message,$template);
- }
- else {
+ default( 'MESSAGE8', $template );
+ } else {
$template->param( delete_category => 1 );
$template->param( categorycode => $categorycode );
}
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index fdd9b91..95f958e 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -335,12 +335,11 @@ elsif ($op eq "add-branch-item") {
my $branches = GetBranches();
my @branchloop;
for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
- my $selected = 1 if $thisbranch eq $branch;
- my %row =(value => $thisbranch,
- selected => $selected,
- branchname => $branches->{$thisbranch}->{'branchname'},
- );
- push @branchloop, \%row;
+ push @branchloop, {
+ value => $thisbranch,
+ selected => $thisbranch eq $branch,
+ branchname => $branches->{$thisbranch}->{'branchname'},
+ };
}
my $sth=$dbh->prepare("SELECT description,categorycode FROM categories ORDER BY description");
@@ -413,7 +412,7 @@ foreach my $entry (@sorted_branch_cat_rules, @sorted_row_loop) {
$entry->{unlimited_maxissueqty} = 1 unless defined($entry->{maxissueqty});
}
-my @sorted_row_loop = sort by_category_and_itemtype @row_loop;
+ at sorted_row_loop = sort by_category_and_itemtype @row_loop;
my $sth_branch_item;
if ($branch eq "*") {
--
1.7.3.2
More information about the Koha-patches
mailing list