X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fprinters.pl;h=c7e7492edabcb044076d83f4011675280a7e8047;hb=9706908b269ebc068b19a0989ca8af6804b1a540;hp=c8a2f340a4510227f707316e2ec9c3143f136e2e;hpb=6419ed7c78568c6c2c090aec40b4422d169be0d6;p=koha.git diff --git a/admin/printers.pl b/admin/printers.pl index c8a2f340a4..c7e7492eda 100755 --- a/admin/printers.pl +++ b/admin/printers.pl @@ -33,66 +33,55 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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. use strict; +#use warnings; FIXME - Bug 2505 use CGI; use C4::Context; use C4::Output; -use C4::Search; -use HTML::Template; use C4::Auth; -use C4::Interface::CGI::Output; sub StringSearch { - my ($env,$searchstring,$type)=@_; - my $dbh = C4::Context->dbh; + my ($searchstring,$type)=@_; # why bother with $type if we don't use it?! $searchstring=~ s/\'/\\\'/g; my @data=split(' ',$searchstring); - my $count=@data; - my $query="Select printername,printqueue,printtype from printers where (printername like \"$data[0]%\") order by printername"; - my $sth=$dbh->prepare($query); - $sth->execute; - my @results; - my $cnt=0; - while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); - $cnt ++; - } - # $sth->execute; - $sth->finish; - return ($cnt,\@results); + my $sth = C4::Context->dbh->prepare(" + SELECT printername,printqueue,printtype from printers + WHERE (printername like ?) order by printername + "); + $sth->execute("$data[0]%"); + my $data=$sth->fetchall_arrayref({}); + return (scalar(@$data),$data); } my $input = new CGI; my $searchfield=$input->param('searchfield'); -my $pkfield="printername"; -my $reqsel="select printername,printqueue,printtype from printers where $pkfield='$searchfield'"; -my $reqdel="delete from printers where $pkfield='$searchfield'"; #my $branchcode=$input->param('branchcode'); -my $offset=$input->param('offset'); +my $offset=$input->param('offset') || 0; my $script_name="/cgi-bin/koha/admin/printers.pl"; my $pagesize=20; my $op = $input->param('op'); $searchfield=~ s/\,//g; -my ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "parameters/printers.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - debug => 1, - }); - +my ($template, $loggedinuser, $cookie) = get_template_and_user({ + template_name => "admin/printers.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => {parameters => 'parameters_remaining_permissions'}, + debug => 1, +}); $template->param(searchfield => $searchfield, script_name => $script_name); #start the page and read in includes +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') { @@ -100,11 +89,9 @@ if ($op eq 'add_form') { #---- if primkey exists, it's a modify action, so read values to modify... my $data; if ($searchfield) { - my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername='$searchfield'"); - $sth->execute; + my $sth=$dbh->prepare("SELECT printername,printqueue,printtype from printers where printername=?"); + $sth->execute($searchfield); $data=$sth->fetchrow_hashref; - $sth->finish; } $template->param(printqueue => $data->{'printqueue'}, @@ -114,62 +101,37 @@ if ($op eq 'add_form') { # called by add_form, used to insert/modify data in DB } elsif ($op eq 'add_validate') { $template->param(add_validate => 1); - my $dbh = C4::Context->dbh; - my $query = "replace printers (printername,printqueue,printtype) values ("; - $query.= $dbh->quote($input->param('printername')).","; - $query.= $dbh->quote($input->param('printqueue')).","; - $query.= $dbh->quote($input->param('printtype')).")"; - my $sth=$dbh->prepare($query); - $sth->execute; - $sth->finish; + if ($input->param('add')){ + my $sth=$dbh->prepare("INSERT INTO printers (printername,printqueue,printtype) VALUES (?,?,?)"); + $sth->execute($input->param('printername'),$input->param('printqueue'),$input->param('printtype')); + } else { + my $sth=$dbh->prepare("UPDATE printers SET printqueue=?,printtype=? WHERE printername=?"); + $sth->execute($input->param('printqueue'),$input->param('printtype'),$input->param('printername')); + } # 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); - my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare($reqsel); - $sth->execute; + my $sth=$dbh->prepare("select printername,printqueue,printtype from printers where printername=?"); + $sth->execute($searchfield); my $data=$sth->fetchrow_hashref; - $sth->finish; $template->param(printqueue => $data->{'printqueue'}, printtype => $data->{'printtype'}); - # 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 $sth=$dbh->prepare($reqdel); - $sth->execute; - $sth->finish; + my $sth=$dbh->prepare("delete from printers where printername=?"); + $sth->execute($searchfield); # END $OP eq DELETE_CONFIRMED -################## DEFAULT ################################## +################## DEFAULT ########################################### } else { # DEFAULT $template->param(else => 1); - - my $env; - my ($count,$results)=StringSearch($env,$searchfield,'web'); - my $toggle="white"; - my @loop; - for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ - my %row = ( printername => $results->[$i]{'printername'}, - printqueue => $results->[$i]{'printqueue'}, - printtype => $results->[$i]{'printtype'}, - toggle => $toggle); - push @loop, \%row; - - if ( $toggle eq 'white' ) - { - $toggle = '#ffffcc'; - } - else - { - $toggle = 'white'; - } - } + my ($count,$results)=StringSearch($searchfield,'web'); + my $max = ($offset+$pagesize < $count) ? $offset+$pagesize : $count; + my @loop = (@$results)[$offset..$max]; $template->param(loop => \@loop); @@ -177,7 +139,6 @@ if ($op eq 'add_form') { $template->param(offsetgtzero => 1, prevpage => $offset-$pagesize); } - print "      "; if ($offset+$pagesize<$count) { $template->param(ltcount => 1, nextpage => $offset+$pagesize);