Bugzilla – Attachment 24479 Details for
Bug 11513
Warnings in Patron categories
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11513 - perltidy, fix license, a couple other eyeball tweaks
Bug-11513---perltidy-fix-license-a-couple-other-ey.patch (text/plain), 27.57 KB, created by
Mark Tompsett
on 2014-01-17 02:26:44 UTC
(
hide
)
Description:
Bug 11513 - perltidy, fix license, a couple other eyeball tweaks
Filename:
MIME Type:
Creator:
Mark Tompsett
Created:
2014-01-17 02:26:44 UTC
Size:
27.57 KB
patch
obsolete
>From 33c33a7874ffebdea6959b8ff5b974172c22fd22 Mon Sep 17 00:00:00 2001 >From: Mark Tompsett <mtompset@hotmail.com> >Date: Thu, 16 Jan 2014 20:27:10 -0500 >Subject: [PATCH] Bug 11513 - perltidy, fix license, a couple other eyeball > tweaks > >Since my single patch failed the QA tool because of tabs, I >refactored the whole indentation using perltidy, corrected the >license to the current one >(http://wiki.koha-community.org/wiki/Coding_Guidelines#Licence) >and then tweaked a few things by eyeball. >--- > admin/categorie.pl | 486 +++++++++++++++++++++++++++++----------------------- > 1 file changed, 273 insertions(+), 213 deletions(-) > mode change 100755 => 100644 admin/categorie.pl > >diff --git a/admin/categorie.pl b/admin/categorie.pl >old mode 100755 >new mode 100644 >index 99e034b..58865ef >--- a/admin/categorie.pl >+++ b/admin/categorie.pl >@@ -6,35 +6,39 @@ > # ALGO : > # this script use an $op to know what to do. > # if $op is empty or none of the above values, >-# - the default screen is build (with all records, or filtered datas). >-# - the user can clic on add, modify or delete record. >+# - the default screen is built >+# (with all records, or filtered datas). >+# - the user can click on add, modify or delete record. > # if $op=add_form >-# - if primkey exists, this is a modification,so we read the $primkey record >-# - builds the add/modify form >+# - if primkey exists, this is a modification, so we read >+# the $primkey record >+# - builds the add/modify form > # if $op=add_validate >-# - the user has just send datas, so we create/modify the record >+# - the user has just send datas, so we create or modify >+# the record > # if $op=delete_form >-# - we show the record having primkey=$primkey and ask for deletion validation form >+# - we show the record having primkey=$primkey and ask for >+# deletion validation form > # if $op=delete_confirm >-# - we delete the record having primkey=$primkey >+# - we delete the record having primkey=$primkey > >- >-# Copyright 2000-2002 Katipo Communications >-# > # This file is part of Koha. > # >-# Koha is free software; you can redistribute it and/or modify it under the >-# terms of the GNU General Public License as published by the Free Software >-# Foundation; either version 2 of the License, or (at your option) any later >-# version. >+# Copyright 2000-2002 Katipo Communications >+# Copyright (C) 2014 Mark Tompsett >+# >+# Koha is free software; you can redistribute it and/or modify it >+# under the terms of the GNU General Public License as published by >+# the Free Software Foundation; either version 3 of the License, or >+# (at your option) any later version. > # >-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY >-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR >-# A PARTICULAR PURPOSE. See the GNU General Public License for more details. >+# Koha is distributed in the hope that it will be useful, but >+# WITHOUT ANY WARRANTY; without even the implied warranty of >+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >+# GNU General Public License for more details. > # >-# You should have received a copy of the GNU General Public License along >-# with Koha; if not, write to the Free Software Foundation, Inc., >-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+# You should have received a copy of the GNU General Public License >+# along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; > >@@ -46,262 +50,318 @@ use C4::Output; > use C4::Dates; > use C4::Form::MessagingPreferences; > >-sub StringSearch { >- my ($searchstring,$type)=@_; >- my $dbh = C4::Context->dbh; >- $searchstring //= ''; >- $searchstring=~ s/\'/\\\'/g; >- my @data=split(' ',$searchstring); >- push @data,q{} if $#data==-1; >- my $count=@data; >- my $sth=$dbh->prepare("Select * from categories where (description like ?) order by category_type,description,categorycode"); >- $sth->execute("$data[0]%"); >- my @results; >- while (my $data=$sth->fetchrow_hashref){ >- push(@results,$data); >- } >- # $sth->execute; >- $sth->finish; >- return (scalar(@results),\@results); >+sub StringSearch { >+ my ( $searchstring, $type ) = @_; >+ my $dbh = C4::Context->dbh; >+ $searchstring //= ''; >+ $searchstring =~ s/\'/\\\'/g; >+ my @data = split( ' ', $searchstring ); >+ push @data, q{} if $#data == -1; >+ my $count = @data; >+ my $sth = $dbh->prepare("Select * from categories where (description like ?) order by category_type,description,categorycode"); >+ $sth->execute("$data[0]%"); >+ my @results; >+ while ( my $data = $sth->fetchrow_hashref ) { >+ push( @results, $data ); >+ } >+ # $sth->execute; >+ $sth->finish; >+ return ( scalar(@results), \@results ); > } > >-my $input = new CGI; >-my $searchfield=$input->param('description'); >-my $script_name="/cgi-bin/koha/admin/categorie.pl"; >-my $categorycode=$input->param('categorycode'); >-my $op = $input->param('op') // ''; >- >-my ($template, $loggedinuser, $cookie) >- = get_template_and_user({template_name => "admin/categorie.tmpl", >- query => $input, >- type => "intranet", >- authnotrequired => 0, >- flagsrequired => {parameters => 'parameters_remaining_permissions'}, >- debug => 1, >- }); >+my $input = new CGI; >+my $searchfield = $input->param('description'); >+my $script_name = "/cgi-bin/koha/admin/categorie.pl"; >+my $categorycode = $input->param('categorycode'); >+my $op = $input->param('op') // ''; > >+my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >+ { >+ template_name => "admin/categorie.tmpl", >+ query => $input, >+ type => "intranet", >+ authnotrequired => 0, >+ flagsrequired => { parameters => 'parameters_remaining_permissions' }, >+ debug => 1, >+ } >+); > >-$template->param(script_name => $script_name, >- categorycode => $categorycode, >- searchfield => $searchfield); >- >+$template->param( >+ script_name => $script_name, >+ categorycode => $categorycode, >+ searchfield => $searchfield >+); > > ################## ADD_FORM ################################## > # called by default. Used to create form to add or modify a record >-if ($op eq 'add_form') { >- $template->param(add_form => 1); >- >- #---- if primkey exists, it's a modify action, so read values to modify... >- my $data; >+if ( $op eq 'add_form' ) { >+ $template->param( add_form => 1 ); >+ >+ #---- if primkey exists, it's a modify action, so read values to modify... >+ my $data; > my @selected_branches; >- if ($categorycode) { >- my $dbh = C4::Context->dbh; >- my $sth=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); >- $sth->execute($categorycode); >- $data=$sth->fetchrow_hashref; >+ if ($categorycode) { >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); >+ $sth->execute($categorycode); >+ $data = $sth->fetchrow_hashref; > > $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM categories_branches AS cb, branches AS b WHERE cb.branchcode = b.branchcode AND cb.categorycode = ?"); >- $sth->execute( $categorycode ); >+ $sth->execute($categorycode); > while ( my $branch = $sth->fetchrow_hashref ) { > push @selected_branches, $branch; > } > $sth->finish; > } > >- $data->{'enrolmentperioddate'} = undef if ($data->{'enrolmentperioddate'} && $data->{'enrolmentperioddate'} eq '0000-00-00'); >+ if ( $data->{'enrolmentperioddate'} && >+ $data->{'enrolmentperioddate'} eq '0000-00-00' ) { >+ $data->{'enrolmentperioddate'} = undef; >+ } > $data->{'category_type'} //= ''; > > my $branches = GetBranches; > my @branches_loop; >- foreach my $branch (sort keys %$branches) { >- my $selected = ( grep {$$_{branchcode} eq $branch} @selected_branches ) ? 1 : 0; >- push @branches_loop, { >+ foreach my $branch ( sort keys %$branches ) { >+ my $selected = >+ ( grep { $$_{branchcode} eq $branch } @selected_branches ) ? 1 : 0; >+ push @branches_loop, >+ { > branchcode => $$branches{$branch}{branchcode}, > branchname => $$branches{$branch}{branchname}, >- selected => $selected, >- }; >+ selected => $selected, >+ }; > } > >- $template->param(description => $data->{'description'}, >- enrolmentperiod => $data->{'enrolmentperiod'}, >- enrolmentperioddate => $data->{'enrolmentperioddate'}, >- upperagelimit => $data->{'upperagelimit'}, >- dateofbirthrequired => $data->{'dateofbirthrequired'}, >- enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'} || 0), >- overduenoticerequired => $data->{'overduenoticerequired'}, >- issuelimit => $data->{'issuelimit'}, >- reservefee => sprintf("%.2f",$data->{'reservefee'} || 0), >- hidelostitems => $data->{'hidelostitems'}, >- category_type => $data->{'category_type'}, >- SMSSendDriver => C4::Context->preference("SMSSendDriver"), >- TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"), >- "type_".$data->{'category_type'} => 1, >- branches_loop => \@branches_loop, >- ); >- if (C4::Context->preference('EnhancedMessagingPreferences')) { >- C4::Form::MessagingPreferences::set_form_values({ categorycode => $categorycode } , $template); >+ $template->param( >+ description => $data->{'description'}, >+ enrolmentperiod => $data->{'enrolmentperiod'}, >+ enrolmentperioddate => $data->{'enrolmentperioddate'}, >+ upperagelimit => $data->{'upperagelimit'}, >+ dateofbirthrequired => $data->{'dateofbirthrequired'}, >+ enrolmentfee => sprintf( "%.2f", $data->{'enrolmentfee'} || 0 ), >+ overduenoticerequired => $data->{'overduenoticerequired'}, >+ issuelimit => $data->{'issuelimit'}, >+ reservefee => sprintf( "%.2f", $data->{'reservefee'} || 0 ), >+ hidelostitems => $data->{'hidelostitems'}, >+ category_type => $data->{'category_type'}, >+ SMSSendDriver => C4::Context->preference("SMSSendDriver"), >+ TalkingTechItivaPhone => >+ C4::Context->preference("TalkingTechItivaPhoneNotification"), >+ "type_" . $data->{'category_type'} => 1, >+ branches_loop => \@branches_loop, >+ ); >+ if ( C4::Context->preference('EnhancedMessagingPreferences') ) { >+ C4::Form::MessagingPreferences::set_form_values( >+ { categorycode => $categorycode }, $template ); > } >- # END $OP eq ADD_FORM >+ >+# END $OP eq ADD_FORM > ################## ADD_VALIDATE ################################## > # called by add_form, used to insert/modify data in DB >-} elsif ($op eq 'add_validate') { >- $template->param(add_validate => 1); >- my $is_a_modif = $input->param("is_a_modif"); >- my $dbh = C4::Context->dbh; >- if($input->param('enrolmentperioddate')){ >- $input->param('enrolmentperioddate' => C4::Dates::format_date_in_iso($input->param('enrolmentperioddate')) ); >- } >- >- if ($is_a_modif) { >- my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?"); >- $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type','categorycode')); >- my @branches = $input->param("branches"); >- if ( @branches ) { >- $sth = $dbh->prepare("DELETE FROM categories_branches WHERE categorycode = ?"); >- $sth->execute( $input->param( "categorycode" ) ); >- $sth = $dbh->prepare( >- "INSERT INTO categories_branches >+} >+elsif ( $op eq 'add_validate' ) { >+ $template->param( add_validate => 1 ); >+ my $is_a_modif = $input->param("is_a_modif"); >+ my $dbh = C4::Context->dbh; >+ if ( $input->param('enrolmentperioddate') ) { >+ $input->param( >+ 'enrolmentperioddate' => C4::Dates::format_date_in_iso( >+ $input->param('enrolmentperioddate') >+ ) >+ ); >+ } >+ >+ if ($is_a_modif) { >+ my $sth = $dbh->prepare( >+"UPDATE categories SET description=?,enrolmentperiod=?, enrolmentperioddate=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,hidelostitems=?,overduenoticerequired=?,category_type=? WHERE categorycode=?" >+ ); >+ $sth->execute( >+ map { $input->param($_) } ( >+ 'description', 'enrolmentperiod', >+ 'enrolmentperioddate', 'upperagelimit', >+ 'dateofbirthrequired', 'enrolmentfee', >+ 'reservefee', 'hidelostitems', >+ 'overduenoticerequired', 'category_type', >+ 'categorycode' >+ ) >+ ); >+ my @branches = $input->param("branches"); >+ if (@branches) { >+ $sth = $dbh->prepare( >+ "DELETE FROM categories_branches WHERE categorycode = ?"); >+ $sth->execute( $input->param("categorycode") ); >+ $sth = $dbh->prepare( >+ "INSERT INTO categories_branches > ( categorycode, branchcode ) > VALUES ( ?, ? )" >- ); >- for my $branchcode ( @branches ) { >- next if not $branchcode; >- $sth->bind_param( 1, $input->param( "categorycode" ) ); >- $sth->bind_param( 2, $branchcode ); >- $sth->execute; >- } >+ ); >+ for my $branchcode (@branches) { >+ next if not $branchcode; >+ $sth->bind_param( 1, $input->param("categorycode") ); >+ $sth->bind_param( 2, $branchcode ); >+ $sth->execute; > } >- $sth->finish; >- } else { >- my $sth=$dbh->prepare("INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)"); >- $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','enrolmentperioddate','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','hidelostitems','overduenoticerequired','category_type')); >- $sth->finish; > } >- if (C4::Context->preference('EnhancedMessagingPreferences')) { >- C4::Form::MessagingPreferences::handle_form_action($input, >- { categorycode => $input->param('categorycode') }, $template); >+ $sth->finish; > } >- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>"; >- exit; >+ else { >+ my $sth = $dbh->prepare( >+"INSERT INTO categories (categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,hidelostitems,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?,?,?)" >+ ); >+ $sth->execute( >+ map { $input->param($_) } ( >+ 'categorycode', 'description', >+ 'enrolmentperiod', 'enrolmentperioddate', >+ 'upperagelimit', 'dateofbirthrequired', >+ 'enrolmentfee', 'reservefee', >+ 'hidelostitems', 'overduenoticerequired', >+ 'category_type' >+ ) >+ ); >+ $sth->finish; >+ } >+ if ( C4::Context->preference('EnhancedMessagingPreferences') ) { >+ C4::Form::MessagingPreferences::handle_form_action( $input, >+ { categorycode => $input->param('categorycode') }, $template ); >+ } >+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>"; >+ exit; > >- # END $OP eq ADD_VALIDATE >+# END $OP eq ADD_VALIDATE > ################## DELETE_CONFIRM ################################## > # called by default form, used to confirm deletion of data in DB >-} elsif ($op eq 'delete_confirm') { >- $template->param(delete_confirm => 1); >+} >+elsif ( $op eq 'delete_confirm' ) { >+ $template->param( delete_confirm => 1 ); >+ >+ my $dbh = C4::Context->dbh; >+ my $sth = $dbh->prepare("select count(*) as total from borrowers where categorycode=?"); >+ $sth->execute($categorycode); >+ my $total = $sth->fetchrow_hashref; >+ $sth->finish; >+ $template->param( total => $total->{'total'} ); > >- my $dbh = C4::Context->dbh; >- my $sth=$dbh->prepare("select count(*) as total from borrowers where categorycode=?"); >- $sth->execute($categorycode); >- my $total = $sth->fetchrow_hashref; >- $sth->finish; >- $template->param(total => $total->{'total'}); >- >- my $sth2=$dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); >- $sth2->execute($categorycode); >- my $data=$sth2->fetchrow_hashref; >- $sth2->finish; >- if ($total->{'total'} >0) { >- $template->param(totalgtzero => 1); >- } >+ my $sth2 = $dbh->prepare("select categorycode,description,enrolmentperiod,enrolmentperioddate,upperagelimit,dateofbirthrequired,enrolmentfee,issuelimit,reservefee,hidelostitems,overduenoticerequired,category_type from categories where categorycode=?"); >+ $sth2->execute($categorycode); >+ my $data = $sth2->fetchrow_hashref; >+ $sth2->finish; >+ if ( $total->{'total'} > 0 ) { >+ $template->param( totalgtzero => 1 ); >+ } > >- $data->{'enrolmentperioddate'} = undef if ($data->{'enrolmentperioddate'} && $data->{'enrolmentperioddate'} eq '0000-00-00'); >- $template->param( description => $data->{'description'}, >- enrolmentperiod => $data->{'enrolmentperiod'}, >- enrolmentperioddate => $data->{'enrolmentperioddate'}, >- upperagelimit => $data->{'upperagelimit'}, >- dateofbirthrequired => $data->{'dateofbirthrequired'}, >- enrolmentfee => sprintf("%.2f",$data->{'enrolmentfee'}), >- overduenoticerequired => $data->{'overduenoticerequired'}, >- issuelimit => $data->{'issuelimit'}, >- reservefee => sprintf("%.2f",$data->{'reservefee'}), >- hidelostitems => $data->{'hidelostitems'}, >- category_type => $data->{'category_type'}, >- ); >- # END $OP eq DELETE_CONFIRM >+ if ( $data->{'enrolmentperioddate'} && >+ $data->{'enrolmentperioddate'} eq '0000-00-00' ) { >+ $data->{'enrolmentperioddate'} = undef; >+ } >+ $template->param( >+ description => $data->{'description'}, >+ enrolmentperiod => $data->{'enrolmentperiod'}, >+ enrolmentperioddate => $data->{'enrolmentperioddate'}, >+ upperagelimit => $data->{'upperagelimit'}, >+ dateofbirthrequired => $data->{'dateofbirthrequired'}, >+ enrolmentfee => sprintf( "%.2f", $data->{'enrolmentfee'} ), >+ overduenoticerequired => $data->{'overduenoticerequired'}, >+ issuelimit => $data->{'issuelimit'}, >+ reservefee => sprintf( "%.2f", $data->{'reservefee'} ), >+ hidelostitems => $data->{'hidelostitems'}, >+ category_type => $data->{'category_type'}, >+ ); >+ >+# END $OP eq DELETE_CONFIRM > ################## DELETE_CONFIRMED ################################## >-# called by delete_confirm, used to effectively confirm deletion of data in DB >-} elsif ($op eq 'delete_confirmed') { >- $template->param(delete_confirmed => 1); >- my $dbh = C4::Context->dbh; >- my $categorycode=uc($input->param('categorycode')); >- my $sth=$dbh->prepare("delete from categories where categorycode=?"); >- $sth->execute($categorycode); >- $sth->finish; >- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>"; >- exit; >+# called by delete_confirm, used to effectively confirm deletion >+# of data in DB >+} >+elsif ( $op eq 'delete_confirmed' ) { >+ $template->param( delete_confirmed => 1 ); >+ my $dbh = C4::Context->dbh; >+ my $categorycode = uc( $input->param('categorycode') ); >+ my $sth = $dbh->prepare("delete from categories where categorycode=?"); >+ $sth->execute($categorycode); >+ $sth->finish; >+ print >+"Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>"; >+ exit; > >- # END $OP eq DELETE_CONFIRMED >-} else { # DEFAULT >- $template->param(else => 1); >- my @loop; >- my ($count,$results)=StringSearch($searchfield,'web'); >+# END $OP eq DELETE_CONFIRMED >+} >+else { # DEFAULT >+ $template->param( else => 1 ); >+ my @loop; >+ my ( $count, $results ) = StringSearch( $searchfield, 'web' ); > my $dbh = C4::Context->dbh; > my $sth = $dbh->prepare("SELECT b.branchcode, b.branchname FROM categories_branches AS cb, branches AS b WHERE cb.branchcode = b.branchcode AND cb.categorycode = ?"); >- for (my $i=0; $i < $count; $i++){ >+ for ( my $i = 0 ; $i < $count ; $i++ ) { > $sth->execute( $results->[$i]{'categorycode'} ); > my @selected_branches; > while ( my $branch = $sth->fetchrow_hashref ) { > push @selected_branches, $branch; > } > my $enrolmentperioddate = $results->[$i]{'enrolmentperioddate'}; >- if (defined($enrolmentperioddate) && $enrolmentperioddate eq '0000-00-00') { >+ if ( $enrolmentperioddate && >+ $enrolmentperioddate eq '0000-00-00' ) { > $enrolmentperioddate = undef; > } >- my %row = ( >- categorycode => $results->[$i]{'categorycode'}, >- description => $results->[$i]{'description'}, >- enrolmentperiod => $results->[$i]{'enrolmentperiod'}, >- enrolmentperioddate => $enrolmentperioddate, >- upperagelimit => $results->[$i]{'upperagelimit'}, >- dateofbirthrequired => $results->[$i]{'dateofbirthrequired'}, >- enrolmentfee => sprintf("%.2f",$results->[$i]{'enrolmentfee'}), >- overduenoticerequired => $results->[$i]{'overduenoticerequired'}, >- issuelimit => $results->[$i]{'issuelimit'}, >- reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}), >- hidelostitems => $results->[$i]{'hidelostitems'}, >- category_type => $results->[$i]{'category_type'}, >- "type_".$results->[$i]{'category_type'} => 1, >- branches => \@selected_branches, >+ $results->[$i]{'category_type'} //= ''; >+ my %row = ( >+ categorycode => $results->[$i]{'categorycode'}, >+ description => $results->[$i]{'description'}, >+ enrolmentperiod => $results->[$i]{'enrolmentperiod'}, >+ enrolmentperioddate => $enrolmentperioddate, >+ upperagelimit => $results->[$i]{'upperagelimit'}, >+ dateofbirthrequired => $results->[$i]{'dateofbirthrequired'}, >+ enrolmentfee => sprintf( "%.2f", $results->[$i]{'enrolmentfee'} || 0), >+ overduenoticerequired => $results->[$i]{'overduenoticerequired'}, >+ issuelimit => $results->[$i]{'issuelimit'}, >+ reservefee => sprintf( "%.2f", $results->[$i]{'reservefee'} || 0), >+ hidelostitems => $results->[$i]{'hidelostitems'}, >+ category_type => $results->[$i]{'category_type'}, >+ "type_" . $results->[$i]{'category_type'} => 1, >+ branches => \@selected_branches, > ); >- if (C4::Context->preference('EnhancedMessagingPreferences')) { >- my $brief_prefs = _get_brief_messaging_prefs($results->[$i]{'categorycode'}); >+ if ( C4::Context->preference('EnhancedMessagingPreferences') ) { >+ my $brief_prefs = _get_brief_messaging_prefs( $results->[$i]{'categorycode'} ); > $row{messaging_prefs} = $brief_prefs if @$brief_prefs; > } >- push @loop, \%row; >- } >- $template->param(loop => \@loop); >- # check that I (institution) and C (child) exists. otherwise => warning to the user >- $sth=$dbh->prepare("select category_type from categories where category_type='C'"); >- $sth->execute; >- my ($categoryChild) = $sth->fetchrow; >- $template->param(categoryChild => $categoryChild); >- $sth=$dbh->prepare("select category_type from categories where category_type='I'"); >- $sth->execute; >- my ($categoryInstitution) = $sth->fetchrow; >- $template->param(categoryInstitution => $categoryInstitution); >- $sth->finish; >+ push @loop, \%row; >+ } >+ $template->param( loop => \@loop ); > >+# check that I (institution) and C (child) exists. otherwise => warning to the user >+ $sth = $dbh->prepare("select category_type from categories where category_type='C'"); >+ $sth->execute; >+ my ($categoryChild) = $sth->fetchrow; >+ $template->param( categoryChild => $categoryChild ); >+ $sth = $dbh->prepare("select category_type from categories where category_type='I'"); >+ $sth->execute; >+ my ($categoryInstitution) = $sth->fetchrow; >+ $template->param( categoryInstitution => $categoryInstitution ); >+ $sth->finish; > >-} #---- END $OP eq DEFAULT >+} #---- END $OP eq DEFAULT > output_html_with_http_headers $input, $cookie, $template->output; > > exit 0; > > sub _get_brief_messaging_prefs { >- my $categorycode = shift; >+ my $categorycode = shift; > my $messaging_options = C4::Members::Messaging::GetMessagingOptions(); >- my $results = []; >- PREF: foreach my $option ( @$messaging_options ) { >- my $pref = C4::Members::Messaging::GetMessagingPreferences( { categorycode => $categorycode, >- message_name => $option->{'message_name'} } ); >- next unless $pref->{'transports'}; >+ my $results = []; >+ PREF: foreach my $option (@$messaging_options) { >+ my $pref = C4::Members::Messaging::GetMessagingPreferences( >+ { >+ categorycode => $categorycode, >+ message_name => $option->{'message_name'} >+ } >+ ); >+ next unless $pref->{'transports'}; > my $brief_pref = { >- message_attribute_id => $option->{'message_attribute_id'}, >- message_name => $option->{'message_name'}, >+ message_attribute_id => $option->{'message_attribute_id'}, >+ message_name => $option->{'message_name'}, > $option->{'message_name'} => 1 > }; >- foreach my $transport ( keys %{$pref->{'transports'}} ) { >+ foreach my $transport ( keys %{ $pref->{'transports'} } ) { > push @{ $brief_pref->{'transports'} }, { transport => $transport }; > } > push @$results, $brief_pref; >-- >1.7.9.5
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=24479">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11513
:
24106
|
24107
|
24164
|
24169
|
24475
|
24476
|
24477
|
24478
|
24479
|
24480
|
24481
|
24865
|
24931