Merging from rel-1-2 to trunk

[koha.git] / admin / currency.pl

diff --git a/admin/currency.pl b/admin/currency.pl
index 5f7aa58..5d77832 100755 (executable)
--- a/admin/currency.pl
+++ b/admin/currency.pl
@@ -19,15 +19,33 @@
 # if $op=delete_confirm
 #      - 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.
+#
+# 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., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
 use strict;
-use C4::Output;
 use CGI;
+use C4::Context;
+use C4::Output;
 use C4::Search;
-use C4::Database;
 
 sub StringSearch  {
        my ($env,$searchstring,$type)=@_;
-       my $dbh = &C4Connect;
+       my $dbh = C4::Context->dbh;
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my $count=@data;
@@ -42,7 +60,6 @@ sub StringSearch  {
        }
        #  $sth->execute;
        $sth->finish;
-       $dbh->disconnect;
        return ($cnt,\@results);
 }
 
@@ -70,7 +87,7 @@ if ($op eq 'add_form') {
        #---- if primkey exists, it's a modify action, so read values to modify...
        my $data;
        if ($searchfield) {
-               my $dbh = &C4Connect;
+               my $dbh = C4::Context->dbh;
                my $sth=$dbh->prepare("select currency,rate from currency where currency='$searchfield'");
                $sth->execute;
                $data=$sth->fetchrow_hashref;
@@ -154,7 +171,7 @@ printend
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
-       my $dbh=C4Connect;
+       my $dbh = C4::Context->dbh;
        my $query = "replace currency (currency,rate) values (";
        $query.= $dbh->quote($input->param('currency')).",";
        $query.= $dbh->quote($input->param('rate')).")";
@@ -169,11 +186,12 @@ printend
 ################## DELETE_CONFIRM ##################################
 # called by default form, used to confirm deletion of data in DB
 } elsif ($op eq 'delete_confirm') {
-       my $dbh = &C4Connect;
+       my $dbh = C4::Context->dbh;
        my $sth=$dbh->prepare("select count(*) as total from aqbooksellers where currency='$searchfield'");
        $sth->execute;
        my $total = $sth->fetchrow_hashref;
        $sth->finish;
+       # FIXME - There's already a $sth in this scope.
        my $sth=$dbh->prepare($reqsel);
        $sth->execute;
        my $data=$sth->fetchrow_hashref;
@@ -193,7 +211,7 @@ printend
 ################## DELETE_CONFIRMED ##################################
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
-       my $dbh=C4Connect;
+       my $dbh = C4::Context->dbh;
 #      my $searchfield=$input->param('branchcode');
        my $sth=$dbh->prepare($reqdel);
        $sth->execute;
@@ -233,7 +251,7 @@ printend
                }
                print mktablerow(4,$toggle,$results->[$i]{'currency'},$results->[$i]{'rate'},
                mklink("$script_name?op=add_form&searchfield=".$results->[$i]{'currency'},'Edit'),
-               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete',''));
+               mklink("$script_name?op=delete_confirm&searchfield=".$results->[$i]{'currency'},'Delete'));
        }
        print mktableft;
        print "<form action='$script_name' method=post>";