diff --git a/admin/aqbookfund.pl b/admin/aqbookfund.pl index 952e068ddc..604ae08c1b 100755 --- a/admin/aqbookfund.pl +++ b/admin/aqbookfund.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -#written 20/02/2002 by paul.poulain@free.fr +# written 20/02/2002 by paul.poulain@free.fr # Copyright 2000-2002 Katipo Communications # @@ -43,14 +43,13 @@ C can be equal to: - builds the add/modify form * add_validate, then - the user has just send datas, so we create/modify the record -* delete_form, then - - we show the record having primkey=$primkey and ask for deletion validation form * delete_confirm, then - we delete the record having primkey=$primkey =cut use strict; +# use warnings; FIXME use CGI; use List::Util qw/min/; use C4::Branch; # GetBranches @@ -62,38 +61,30 @@ use C4::Output; use C4::Dates; use C4::Debug; -# use Smart::Comments; +my $input = new CGI; +my $script_name = "/cgi-bin/koha/admin/aqbookfund.pl"; +my $bookfundid = $input->param('bookfundid'); +my $branchcodeid = $input->param('branchcode') || ''; +my $op = $input->param('op') || ''; +my $pagesize = 10; -my $dbh = C4::Context->dbh; -my $input = new CGI; -my $script_name="/cgi-bin/koha/admin/aqbookfund.pl"; -my $bookfundid=$input->param('bookfundid'); -my $branchcodeid=$input->param('branchcode')|''; -my $pagesize = 10; -my $op = $input->param('op') || ''; +$bookfundid = uc $bookfundid if $bookfundid; -my ($template, $borrowernumber, $cookie) - = get_template_and_user( - {template_name => "admin/aqbookfund.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {parameters => 1}, - debug => 1, - } - ); +my ($template, $borrowernumber, $cookie) = get_template_and_user( + { template_name => "admin/aqbookfund.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { parameters => 1 }, + debug => 1, + } +); -if ($op) { - $template->param( - script_name => $script_name, - $op => 1, - ); # we show only the TMPL_VAR names $op -} -else { - $template->param(script_name => $script_name, - else => 1); # we show only the TMPL_VAR names $op -} -$template->param(action => $script_name); +$template->param( + action => $script_name, + script_name => $script_name, + ($op||'else') => 1, +); my $branches = GetBranches; @@ -102,73 +93,55 @@ my $branches = GetBranches; if ($op eq 'add_form') { #---- if primkey exists, it's a modify action, so read values to modify... my $dataaqbookfund; - my $header; if ($bookfundid) { - $dataaqbookfund = GetBookFund($bookfundid,$branchcodeid); - } - if ($bookfundid) { - $header = "Modify book fund"; + $dataaqbookfund = GetBookFund($bookfundid, $branchcodeid); $template->param('header-is-modify-p' => 1); - $template->param('current_branch' => $branchcodeid); + $template->param('current_branch' => $branchcodeid); } else { - $header = "Add book fund"; $template->param('header-is-add-p' => 1); } - $template->param('use-header-flags-p' => 1); - $template->param(header => $header); # NOTE deprecated - my $add_or_modify=0; - if ($bookfundid) { - $add_or_modify=1; - } - $template->param(add_or_modify => $add_or_modify); - $template->param(bookfundid =>$bookfundid); - $template->param(bookfundname =>$dataaqbookfund->{'bookfundname'}); + $template->param( + 'use-header-flags-p' => 1, + add_or_modify => $bookfundid ? 1 : 0, + bookfundid => $bookfundid, + bookfundname => $dataaqbookfund->{'bookfundname'} + ); - my @branchloop; - foreach my $branchcode (sort keys %{$branches}) { - my $row = { - branchcode => $branchcode, - branchname => $branches->{$branchcode}->{branchname}, - }; + my @branchloop; + foreach my $branchcode (sort keys %{$branches}) { + push @branchloop, { + branchcode => $branchcode, + branchname => $branches->{$branchcode}->{branchname}, + selected => (defined $bookfundid and defined $dataaqbookfund->{branchcode} + and $dataaqbookfund->{branchcode} eq $branchcode) ? 1 : 0, + }; + } - if (defined $bookfundid - and defined $dataaqbookfund->{branchcode} - and $dataaqbookfund->{branchcode} eq $branchcode) { - $row->{selected} = 1; - } - - push @branchloop, $row; - } - - $template->param(branches => \@branchloop); + $template->param(branches => \@branchloop); } # END $OP eq ADD_FORM #-----############# ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB elsif ($op eq 'add_validate') { -### add - my $bookfundid = uc $input->param('bookfundid'); - my $bookfundname = $input->param('bookfundname'); - my $branchcode = $input->param('branchcode') || undef; - + my $bookfundname = $input->param('bookfundname'); + my $branchcode = $input->param('branchcode') || undef; my $number = Countbookfund($bookfundid,$branchcodeid); if ($number == 0 ) { - NewBookFund( $bookfundid, $input->param('bookfundname'), $input->param('branchcode')||'' ); } - $input->redirect('aqbookfund.pl'); + print $input->redirect('aqbookfund.pl'); # FIXME: unnecessary redirect + exit; # END $OP eq ADD_VALIDATE } #-----############# MOD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB elsif ($op eq 'mod_validate') { - my $bookfundid = uc $input->param('bookfundid'); my $bookfundname = $input->param('bookfundname'); my $branchcode = $input->param('branchcode' ) || undef; my $current_branch = $input->param('current_branch') || undef; @@ -176,34 +149,27 @@ elsif ($op eq 'mod_validate') { my $number = Countbookfund($bookfundid,$branchcodeid); if ($number < 2) { - $debug and warn "name :$bookfundname branch:$branchcode"; + $debug and warn "name :$bookfundname branch:$branchcode"; ModBookFund($bookfundname,$bookfundid,$current_branch, $branchcode); } - $input->redirect('aqbookfund.pl'); + print $input->redirect('aqbookfund.pl'); # FIXME: unnecessary redirect + exit; } #-----############# DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB elsif ($op eq 'delete_confirm') { my $data = GetBookFund($bookfundid,$branchcodeid); - $template->param(bookfundid => $bookfundid); + $template->param(bookfundid => $bookfundid); $template->param(bookfundname => $data->{'bookfundname'}); - $template->param(branchcode => $data->{'branchcode'}); -} # END $OP eq DELETE_CONFIRM - -#-----############# DELETE_CONFIRMED ################################## + $template->param(branchcode => $data->{'branchcode'}); +} # called by delete_confirm, used to effectively confirm deletion of data in DB elsif ($op eq 'delete_confirmed') { - DelBookFund(uc($input->param('bookfundid')),$branchcodeid); - -}# END $OP eq DELETE_CONFIRMED - -#-----############# DEFAULT ################################## + DelBookFund($bookfundid, $branchcodeid); +} else { # DEFAULT - my ($query, $sth); - - $template->param(scriptname => $script_name); - + my ($sth); # filters my @branchloop; foreach my $branchcode (sort keys %{$branches}) { @@ -225,12 +191,12 @@ else { # DEFAULT if (defined $input->param('filter_bookfundid') and $input->param('filter_bookfundid') eq $row->{bookfundid}){ $row->{selected} = 1; } - push @bookfundids_loop, $row; - } + push @bookfundids_loop, $row; + } $template->param( - filter_bookfundids => \@bookfundids_loop, - filter_branches => \@branchloop, + filter_bookfundids => \@bookfundids_loop, + filter_branches => \@branchloop, filter_bookfundname => $input->param('filter_bookfundname') || undef, ); @@ -269,15 +235,11 @@ else { # DEFAULT ); foreach my $result (@results[$first .. $last]) { - push( - @loop, - { - %{$result}, - branchname => - $branches->{ $result->{branchcode} }->{branchname}, - has_budgets => defined $nb_budgets_of{ $result->{bookfundid} }, - } - ); + push @loop, { + %{$result}, + branchname => $branches->{ $result->{branchcode} }->{branchname}, + has_budgets => defined $nb_budgets_of{ $result->{bookfundid} }, + }; } $template->param( @@ -288,6 +250,7 @@ else { # DEFAULT $page, 'page' ) - ); -} #---- END $OP eq DEFAULT + ); +} + output_html_with_http_headers $input, $cookie, $template->output; diff --git a/admin/aqbudget.pl b/admin/aqbudget.pl index fb4d168dbf..33edc1cd76 100755 --- a/admin/aqbudget.pl +++ b/admin/aqbudget.pl @@ -38,6 +38,7 @@ # Suite 330, Boston, MA 02111-1307 USA use strict; +# use warnings; FIXME use CGI; use C4::Branch; # GetBranches use List::Util qw/min/; @@ -53,8 +54,8 @@ my $script_name="/cgi-bin/koha/admin/aqbudget.pl"; my $bookfundid = $input->param('bookfundid'); my $aqbudgetid = $input->param('aqbudgetid'); my $branchcodeid = $input->param('branchcode'); +my $op = $input->param('op') || ''; my $pagesize = 20; -my $op = $input->param('op'); my ($template, $borrowernumber, $cookie) = get_template_and_user( @@ -83,8 +84,6 @@ my ($flags, $homebranch)=$sthtemp->fetchrow; # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { my ($query, $dataaqbudget, $dataaqbookfund, $sth); - my $dbh = C4::Context->dbh; - #---- if primkey exists, it's a modify action, so read values to modify... if ($aqbudgetid) { $query = ' @@ -104,7 +103,6 @@ SELECT aqbudgetid, $sth=$dbh->prepare($query); $sth->execute($aqbudgetid); $dataaqbudget=$sth->fetchrow_hashref; - $sth->finish; } $query = ' @@ -121,7 +119,6 @@ SELECT aqbookfund.branchcode, $branchcodeid ); $dataaqbookfund=$sth->fetchrow_hashref; - $sth->finish; if (defined $aqbudgetid) { $template->param( @@ -160,10 +157,8 @@ SELECT branchcode, $branch->{selected} = $dataaqbudget->{branchcode} eq $row->{branchcode} ? 1 : 0; } - push @branches, $branch; } - $sth->finish; $template->param( dateformat => C4::Dates->new()->visual(), @@ -205,7 +200,6 @@ UPDATE aqbudget $input->param('branch') || '', $aqbudgetid, ); - $sth->finish; } else { $query = ' @@ -223,36 +217,31 @@ INSERT $input->param('budgetamount'), $input->param('branch') || '', ); - $sth->finish; } - $input->redirect("aqbudget.pl"); - + print $input->redirect("aqbudget.pl"); # FIXME: unnecessary redirect + exit; # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { - my $dbh = C4::Context->dbh; my $sth=$dbh->prepare("select aqbudgetid,bookfundid,startdate,enddate,budgetamount,branchcode from aqbudget where aqbudgetid=?"); $sth->execute($aqbudgetid); my $data=$sth->fetchrow_hashref; - $sth->finish; $template->param(bookfundid => $bookfundid); $template->param(aqbudgetid => $data->{'aqbudgetid'}); - $template->param(startdate => format_date($data->{'startdate'})); - $template->param(enddate => format_date($data->{'enddate'})); + $template->param(startdate => format_date($data->{'startdate'})); + $template->param(enddate => format_date($data->{'enddate'})); $template->param(budgetamount => $data->{'budgetamount'}); # 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') { - my $dbh = C4::Context->dbh; my $aqbudgetid=uc($input->param('aqbudgetid')); my $sth=$dbh->prepare("delete from aqbudget where aqbudgetid=?"); $sth->execute($aqbudgetid); - $sth->finish; - print $input->redirect("aqbookfund.pl"); - return; + print $input->redirect("aqbookfund.pl"); + exit; # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## } else { # DEFAULT @@ -270,7 +259,6 @@ SELECT bookfundid, bookfundname while (my $row = $sth->fetchrow_hashref) { $bookfundname_of{ $row->{bookfundid} } = $row->{bookfundname}; } - $sth->finish; # filters my $branches = GetBranches(); @@ -285,7 +273,6 @@ SELECT bookfundid, bookfundname and $input->param('filter_branchcode') eq $branchcode) { $row->{selected} = 1; } - push @branchloop, $row; } @@ -301,10 +288,8 @@ SELECT bookfundid and $input->param('filter_bookfundid') eq $row->{bookfundid}) { $row->{selected} = 1; } - push @bookfundids_loop, $row; } - $sth->finish; $template->param( filter_bookfundids => \@bookfundids_loop, @@ -341,7 +326,7 @@ SELECT aqbudgetid, budgetamount, branchcode FROM aqbudget - WHERE 1 = 1'; # What's the point? + WHERE 1 = 1'; my @bindings; @@ -389,7 +374,6 @@ SELECT aqbudgetid, while (my $row = $sth->fetchrow_hashref){ push @results, $row; } - $sth->finish; # filter budgets depending on the pagination my $page = $input->param('page') || 1; @@ -404,16 +388,13 @@ SELECT aqbudgetid, my @loop; foreach my $result (@results[$first .. $last]) { - push( - @loop, - { - %{$result}, - bookfundname => $bookfundname_of{ $result->{'bookfundid'} }, - branchname => $branches->{ $result->{branchcode} }->{branchname}, - startdate => format_date($result->{startdate}), - enddate => format_date($result->{enddate}), - } - ); + push @loop, { + %{$result}, + bookfundname => $bookfundname_of{ $result->{'bookfundid'} }, + branchname => $branches->{ $result->{branchcode} }->{branchname}, + startdate => format_date($result->{startdate}), + enddate => format_date($result->{enddate}), + }; } $template->param( diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index b166777b05..6eb3667783 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -29,19 +29,10 @@ sub string_search { my $dbh = C4::Context->dbh; $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); - my $count=@data; my $sth=$dbh->prepare("Select * from auth_subfield_structure where (tagfield like ? and authtypecode=?) order by tagfield"); $sth->execute("$searchstring%",$authtypecode); - my @results; - my $cnt=0; - my $u=1; - while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); - $cnt ++; - $u++; - } - $sth->finish; - return ($cnt,\@results); + my $results = $sth->fetchall_arrayref({}); + return (scalar(@$results), $results); } sub auth_subfield_structure_exists { @@ -52,25 +43,25 @@ sub auth_subfield_structure_exists { return @$rows > 0; } -my $input = new CGI; -my $tagfield=$input->param('tagfield'); -my $tagsubfield=$input->param('tagsubfield'); -my $authtypecode=$input->param('authtypecode'); -my $pkfield="tagfield"; -my $offset=$input->param('offset'); -my $script_name="/cgi-bin/koha/admin/auth_subfields_structure.pl"; +my $input = new CGI; +my $tagfield = $input->param('tagfield'); +my $tagsubfield = $input->param('tagsubfield'); +my $authtypecode = $input->param('authtypecode'); +my $offset = $input->param('offset'); +my $op = $input->param('op') || ''; +my $script_name = "/cgi-bin/koha/admin/auth_subfields_structure.pl"; -my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => "admin/auth_subfields_structure.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {parameters => 1}, - debug => 1, - }); -my $pagesize=30; -my $op = $input->param('op'); -$tagfield=~ s/\,//g; +my ($template, $borrowernumber, $cookie) = get_template_and_user( + { template_name => "admin/auth_subfields_structure.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { parameters => 1 }, + debug => 1, + } +); +my $pagesize = 30; +$tagfield =~ s/\,//g; if ($op) { $template->param(script_name => $script_name, @@ -84,11 +75,11 @@ $template->param(script_name => $script_name, else => 1); # we show only the TMPL_VAR names $op } +my $dbh = C4::Context->dbh; ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record if ($op eq 'add_form') { my $data; - my $dbh = C4::Context->dbh; my $more_subfields = $input->param("more_subfields")+1; # builds kohafield tables my @kohafields; @@ -100,7 +91,6 @@ if ($op eq 'add_form') { } # build authorised value list - $sth2->finish; $sth2 = $dbh->prepare("select distinct category from authorised_values"); $sth2->execute; my @authorised_values; @@ -112,7 +102,6 @@ if ($op eq 'add_form') { push (@authorised_values,"itemtypes"); # build thesaurus categories list - $sth2->finish; $sth2 = $dbh->prepare("select authtypecode from auth_types"); $sth2->execute; my @authtypes; @@ -393,7 +382,6 @@ if ($op eq 'add_form') { ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { - my $dbh = C4::Context->dbh; $template->param(tagfield => "$input->param('tagfield')"); # my $sth=$dbh->prepare("replace auth_subfield_structure (authtypecode,tagfield,tagsubfield,liblibrarian,libopac,repeatable,mandatory,kohafield,tab,seealso,authorised_value,frameworkcode,value_builder,hidden,isurl) # values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)"); @@ -478,8 +466,6 @@ if ($op eq 'add_form') { } } } - $sth_insert->finish; - $sth_update->finish; print "Content-Type: text/html\n\n"; exit; @@ -487,11 +473,9 @@ if ($op eq 'add_form') { ################## DELETE_CONFIRM ################################## # called by default form, used to confirm deletion of data in DB } elsif ($op eq 'delete_confirm') { - my $dbh = C4::Context->dbh; my $sth=$dbh->prepare("select * from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?"); $sth->execute($tagfield,$tagsubfield,$authtypecode); my $data=$sth->fetchrow_hashref; - $sth->finish; $template->param(liblibrarian => $data->{'liblibrarian'}, tagsubfield => $data->{'tagsubfield'}, delete_link => $script_name, @@ -503,11 +487,9 @@ if ($op eq 'add_form') { ################## DELETE_CONFIRMED ################################## # called by delete_confirm, used to effectively confirm deletion of data in DB } elsif ($op eq 'delete_confirmed') { - my $dbh = C4::Context->dbh; unless (C4::Context->config('demo') eq 1) { my $sth=$dbh->prepare("delete from auth_subfield_structure where tagfield=? and tagsubfield=? and authtypecode=?"); $sth->execute($tagfield,$tagsubfield,$authtypecode); - $sth->finish; } print "Content-Type: text/html\n\n"; exit; diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index 279a10ca55..4cd9b75508 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -29,20 +29,17 @@ use C4::Context; # retrieve parameters my $input = new CGI; -my $authtypecode = $input->param('authtypecode'); # set to select framework -$authtypecode="" unless $authtypecode; -my $existingauthtypecode = $input->param('existingauthtypecode'); # set when we have to create a new framework (in authtype) by copying an old one (in existingauthtype) -$existingauthtypecode = "" unless $existingauthtypecode; +my $authtypecode = $input->param('authtypecode') || ''; # set to select framework +my $existingauthtypecode = $input->param('existingauthtypecode') || ''; # set when we have to create a new framework (in authtype) by copying an old one (in existingauthtype) + # my $authtypeinfo = getauthtypeinfo($authtype); -my $searchfield=$input->param('searchfield'); -$searchfield=0 unless $searchfield; -$searchfield=~ s/\,//g; +my $searchfield = $input->param('searchfield') || 0; +my $offset = $input->param('offset') || 0; +my $op = $input->param('op') || ''; +$searchfield =~ s/\,//g; -my $offset=$input->param('offset'); -my $op = $input->param('op'); -my $pagesize=20; - -my $script_name="/cgi-bin/koha/admin/auth_tag_structure.pl"; +my $pagesize = 20; +my $script_name = "/cgi-bin/koha/admin/auth_tag_structure.pl"; my $dbh = C4::Context->dbh; @@ -71,7 +68,6 @@ foreach my $thisauthtype (keys %$authtypes) { my $sth; # check that authtype framework is defined in auth_tag_structure if we are on a default action if (!$op or $op eq 'authtype_create_confirm') { -#warn "IN"; $sth=$dbh->prepare("select count(*) from auth_tag_structure where authtypecode=?"); $sth->execute($authtypecode); my ($authtypeexist) = $sth->fetchrow; @@ -86,13 +82,12 @@ if (!$op or $op eq 'authtype_create_confirm') { } } } +$template->param(script_name => $script_name); $template->param(authtypeloop => \@authtypesloop); -if ($op && $op ne 'authtype_create_confirm') { -$template->param(script_name => $script_name, - $op => 1); # we show only the TMPL_VAR names $op +if ($op ne 'authtype_create_confirm') { + $template->param($op => 1); } else { -$template->param(script_name => $script_name, - else => 1); # we show only the TMPL_VAR names $op + $template->param(else => 1); } ################## ADD_FORM ################################## @@ -104,7 +99,6 @@ if ($op eq 'add_form') { $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where tagfield=? and authtypecode=?"); $sth->execute($searchfield,$authtypecode); $data=$sth->fetchrow_hashref; - $sth->finish; } my $sth = $dbh->prepare("select distinct category from authorised_values"); $sth->execute; @@ -143,46 +137,37 @@ if ($op eq 'add_form') { ################## ADD_VALIDATE ################################## # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { - if ($input->param('modif')) { - $sth=$dbh->prepare("UPDATE auth_tag_structure SET tagfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, authorised_value=? WHERE authtypecode=? AND tagfield=?"); - my $tagfield =$input->param('tagfield'); - my $liblibrarian = $input->param('liblibrarian'); - my $libopac =$input->param('libopac'); - my $repeatable =$input->param('repeatable'); - my $mandatory =$input->param('mandatory'); - my $authorised_value =$input->param('authorised_value'); - unless (C4::Context->config('demo') eq 1) { + my $tagfield = $input->param('tagfield'); + my $liblibrarian = $input->param('liblibrarian'); + my $libopac = $input->param('libopac'); + my $repeatable = $input->param('repeatable') ? 1 : 0; + my $mandatory = $input->param('mandatory') ? 1 : 0; + my $authorised_value = $input->param('authorised_value'); + unless (C4::Context->config('demo') eq 1) { + if ($input->param('modif')) { + $sth=$dbh->prepare("UPDATE auth_tag_structure SET tagfield=?, liblibrarian=?, libopac=?, repeatable=?, mandatory=?, authorised_value=? WHERE authtypecode=? AND tagfield=?"); $sth->execute( - $tagfield, - $liblibrarian, - $libopac, - $repeatable?1:0, - $mandatory?1:0, - $authorised_value, - $authtypecode, - $tagfield, - ); + $tagfield, + $liblibrarian, + $libopac, + $repeatable, + $mandatory, + $authorised_value, + $authtypecode, + $tagfield, + ); + } else { + $sth=$dbh->prepare("INSERT INTO auth_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,authtypecode) VALUES (?,?,?,?,?,?,?)"); + $sth->execute( + $tagfield, + $liblibrarian, + $libopac, + $repeatable, + $mandatory, + $authorised_value, + $authtypecode + ); } - $sth->finish; - } else { - $sth=$dbh->prepare("INSERT INTO auth_tag_structure (tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value,authtypecode) VALUES (?,?,?,?,?,?,?)"); - my $tagfield =$input->param('tagfield'); - my $liblibrarian = $input->param('liblibrarian'); - my $libopac =$input->param('libopac'); - my $repeatable =$input->param('repeatable'); - my $mandatory =$input->param('mandatory'); - my $authorised_value =$input->param('authorised_value'); - unless (C4::Context->config('demo') eq 1) { - $sth->execute($tagfield, - $liblibrarian, - $libopac, - $repeatable?1:0, - $mandatory?1:0, - $authorised_value, - $authtypecode - ); - } - $sth->finish; } print "Content-Type: text/html\n\nparam('tagfield')."&authtypecode=$authtypecode\">"; exit; @@ -193,7 +178,6 @@ if ($op eq 'add_form') { $sth=$dbh->prepare("select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where tagfield=?"); $sth->execute($searchfield); my $data=$sth->fetchrow_hashref; - $sth->finish; $template->param(liblibrarian => $data->{'liblibrarian'}, searchfield => $searchfield, authtypecode => $authtypecode, @@ -205,6 +189,7 @@ if ($op eq 'add_form') { unless (C4::Context->config('demo') eq 1) { $dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'"); $dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'"); + # FIXME: Secuity vulnerability -- use placeholders, prepare and execute! } print "Content-Type: text/html\n\nparam('tagfield')."&authtypecode=$authtypecode\">"; exit; @@ -243,15 +228,15 @@ if ($op eq 'add_form') { $toggle=1; } my %row_data; # get a fresh hash for the row data - $row_data{tagfield} = $results->[$i]{'tagfield'}; - $row_data{liblibrarian} = $results->[$i]{'liblibrarian'}; - $row_data{repeatable} = $results->[$i]{'repeatable'}; - $row_data{mandatory} = $results->[$i]{'mandatory'}; - $row_data{authorised_value} = $results->[$i]{'authorised_value'}; - $row_data{subfield_link} ="auth_subfields_structure.pl?tagfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode; - $row_data{edit} = "$script_name?op=add_form&searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode; - $row_data{delete} = "$script_name?op=delete_confirm&searchfield=".$results->[$i]{'tagfield'}."&authtypecode=".$authtypecode; - $row_data{toggle} = $toggle; + $row_data{tagfield} = $results->[$i]{'tagfield'}; + $row_data{liblibrarian} = $results->[$i]{'liblibrarian'}; + $row_data{repeatable} = $results->[$i]{'repeatable'}; + $row_data{mandatory} = $results->[$i]{'mandatory'}; + $row_data{authorised_value} = $results->[$i]{'authorised_value'}; + $row_data{subfield_link} = "auth_subfields_structure.pl?tagfield=" . $results->[$i]{'tagfield'} . "&authtypecode=" . $authtypecode; + $row_data{edit} = "$script_name?op=add_form&searchfield=" . $results->[$i]{'tagfield'} . "&authtypecode=" . $authtypecode; + $row_data{delete} = "$script_name?op=delete_confirm&searchfield=" . $results->[$i]{'tagfield'} . "&authtypecode=" . $authtypecode; + $row_data{toggle} = $toggle; push(@loop_data, \%row_data); } $template->param(loop => \@loop_data, @@ -262,24 +247,18 @@ if ($op eq 'add_form') { $template->param(isprevpage => $offset, prevpage=> $prevpage, searchfield => $searchfield, - script_name => $script_name, ); } if ($offset+$pagesize<$count) { my $nextpage =$offset+$pagesize; $template->param(nextpage =>$nextpage, searchfield => $searchfield, - script_name => $script_name, ); } } #---- END $OP eq DEFAULT -$template->param(loggeninuser => $loggedinuser, - ); - output_html_with_http_headers $input, $cookie, $template->output; - # # the sub used for searches # @@ -288,15 +267,12 @@ sub StringSearch { my $dbh = C4::Context->dbh; $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); - my $count=@data; my $sth=$dbh->prepare("Select tagfield,liblibrarian,libopac,repeatable,mandatory,authorised_value from auth_tag_structure where (tagfield >= ? and authtypecode=?) order by tagfield"); $sth->execute($data[0], $authtypecode); my @results; while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); + push(@results,$data); } - # $sth->execute; - $sth->finish; return (scalar(@results),\@results); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl index 3403c690ca..eb464b9d46 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbookfund.tmpl @@ -1,43 +1,15 @@ Koha › Administration › Funds and Budgets - + $(document).ready(function() { + new YAHOO.widget.Button("newfund"); + }); +//]]> + - +
- -
-
-
+
+
+
-
- - -

Funds and budgets administration

@@ -113,28 +72,18 @@ + + + - - - - - - - - - - - - - ?op=add_form&bookfundid=&branchcode=">Edit - ?op=delete_confirm&bookfundid=&branchcode=">Delete + ?op=add_form&bookfundid=&branchcode=">Edit + ?op=delete_confirm&bookfundid=&branchcode=">Delete &branchcode=">Add budget ">Show budgets -
@@ -150,44 +99,37 @@
" name="Aform" method="post"> - + "/> - - - + - - - - +
- + Modify book fundAdd book fund + -
    -
  1. - Fund: +
      + +
    1. Fund: " />
      2. -
    2. - - +
    3. +
      4. -
    4. - - " /> -
      5. +
    5. + " /> +
      6. -
    6. - - @@ -197,38 +139,29 @@ -
    +
    2. +
- Cancel + + Cancel
-

Fund added

-

">Return to fund list

- - - - +

Fund modified

-

">Return to fund list

- - - - - - +

Confirm Deletion of Fund

" method="post"> @@ -236,31 +169,27 @@ " /> " /> - + - - -
Fund:
Library:
Name:
Group:
-
-
-
+ + +
+
- - - +

Data Deleted

-
" method="post"> +" method="get">