bug 1368 - remove FOREIGN_KEY_CHECKS = 0 from installer

[koha_ffzg] / admin / z3950servers.pl

diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl
index a8851bc..a02714b 100755 (executable)
--- a/admin/z3950servers.pl
+++ b/admin/z3950servers.pl
@@ -20,20 +20,18 @@
 #      - we delete the record having primkey=$primkey
 
 use strict;
-use C4::Output;
 use CGI;
-use C4::Search;
 use C4::Context;
 use C4::Auth;
-use C4::Interface::CGI::Output;
+use C4::Output;
 
 sub StringSearch  {
-       my ($env,$searchstring,$type)=@_;
+       my ($searchstring,$type)=@_;
        my $dbh = C4::Context->dbh;
        $searchstring=~ s/\'/\\\'/g;
        my @data=split(' ',$searchstring);
        my $count=@data;
-       my $sth=$dbh->prepare("Select * from z3950servers where (name like ?) order by rank,name");
+       my $sth=$dbh->prepare("Select host,port,db,userid,password,name,id,checked,rank,syntax from z3950servers where (name like ?) order by rank,name");
        $sth->execute("$data[0]\%");
        my @results;
        while (my $data=$sth->fetchrow_hashref) {
@@ -52,7 +50,6 @@ my $script_name="/cgi-bin/koha/admin/z3950servers.pl";
 
 my $pagesize=20;
 my $op = $input->param('op');
-$searchfield=~ s/\,//g;
 
 my ($template, $loggedinuser, $cookie) 
     = get_template_and_user({template_name => "admin/z3950servers.tmpl",
@@ -76,7 +73,7 @@ if ($op eq 'add_form') {
        my $data;
        if ($searchfield) {
                my $dbh = C4::Context->dbh;
-               my $sth=$dbh->prepare("select * from z3950servers where (name = ?) order by rank,name");
+               my $sth=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax from z3950servers where (name = ?) order by rank,name");
                $sth->execute($searchfield);
                $data=$sth->fetchrow_hashref;
                $sth->finish;
@@ -87,17 +84,7 @@ if ($op eq 'add_form') {
                         db   => $data->{'db'},
                         userid => $data->{'userid'},
                         password => $data->{'password'},
-               
-                       opacshow => CGI::checkbox(-name=>'opacshow',
-                                               -checked=> $data->{'opacshow'}?'checked':'',
-                                               -value=> 1,
-                                               -label => '',
-                                               -id=> 'opacshow'),
-                       checked => CGI::checkbox(-name=>'checked',
-                                               -checked=> $data->{'checked'}?'checked':'',
-                                               -value=> 1,
-                                               -label => '',
-                                               -id=> 'checked'),
+                        checked => $data->{'checked'},
                         rank => $data->{'rank'});
                                                                                                        # END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
@@ -108,24 +95,30 @@ if ($op eq 'add_form') {
        my $sth=$dbh->prepare("select * from z3950servers where name=?");
        $sth->execute($input->param('searchfield'));
        if ($sth->rows) {
-               $sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,opacshow=?,syntax=? where name=?");
+               $sth=$dbh->prepare("update z3950servers set host=?, port=?, db=?, userid=?, password=?, name=?, checked=?, rank=?,syntax=? where name=?");
                $sth->execute($input->param('host'),
                      $input->param('port'),
                      $input->param('db'),
                      $input->param('userid'),
                      $input->param('password'),
                      $input->param('searchfield'),
-                     $input->param('checked')?1:0,
+                     $input->param('checked'),
                      $input->param('rank'),
-                  $input->param('opacshow')?1:0,
                         $input->param('syntax'),
                      $input->param('searchfield'),
                      );
        } else {
-               $sth=$dbh->prepare("insert into z3950servers (host,port,db,userid,password,name,checked,rank,opacshow,syntax) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ? )");
-               $sth->execute($input->param('host'), $input->param('port'), $input->param('db'), $input->param('userid'),
-                     $input->param('password'), $input->param('searchfield'),$input->param('checked')?1:0, $input->param('rank'),
-                     $input->param('opacshow')?1:0,$input->param('syntax') );
+               $sth=$dbh->prepare("insert into z3950servers (host,port,db,userid,password,name,checked,rank,syntax) values (?, ?, ?, ?, ?, ?, ?, ?,?)");
+               $sth->execute($input->param('host'),
+                     $input->param('port'),
+                     $input->param('db'),
+                     $input->param('userid'),
+                     $input->param('password'),
+                     $input->param('searchfield'),
+                     $input->param('checked'),
+                     $input->param('rank'),
+                        $input->param('syntax'),
+                     );
        }
        $sth->finish;
                                                                                                        # END $OP eq ADD_VALIDATE
@@ -135,7 +128,7 @@ if ($op eq 'add_form') {
        $template->param(delete_confirm => 1);
        my $dbh = C4::Context->dbh;
 
-       my $sth2=$dbh->prepare("select * from z3950servers where (name = ?) order by rank,name");
+       my $sth2=$dbh->prepare("select host,port,db,userid,password,name,id,checked,rank,syntax from z3950servers where (name = ?) order by rank,name");
        $sth2->execute($searchfield);
        my $data=$sth2->fetchrow_hashref;
        $sth2->finish;
@@ -145,16 +138,7 @@ if ($op eq 'add_form') {
                          db   => $data->{'db'},
                          userid => $data->{'userid'},
                          password => $data->{'password'},
-                      checked => CGI::checkbox(-name=>'checked',
-                                               -checked=> $data->{'checked'}?'checked':'',
-                                               -value=> 1,
-                                               -label => '',
-                                               -id=> 'checked'),
-               opacshow => CGI::checkbox(-name=>'opacshow',
-                                               -checked=> $data->{'opacshow'}?'checked':'',
-                                               -value=> 1,
-                                               -label => '',
-                                               -id=> 'opacshow'),
+                         checked => $data->{'checked'},
                          rank => $data->{'rank'});
 
                                                                                                        # END $OP eq DELETE_CONFIRM
@@ -170,9 +154,7 @@ if ($op eq 'add_form') {
 ################## DEFAULT ##################################
 } else { # DEFAULT
        $template->param(else => 1);
-
-       my $env;
-       my ($count,$results)=StringSearch($env,$searchfield,'web');
+       my ($count,$results)=StringSearch($searchfield,'web');
        my @loop;
        my $toggle = 0;
        for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
@@ -186,7 +168,6 @@ if ($op eq 'add_form') {
                        userid =>$results->[$i]{'userid'},
                        password => ($results->[$i]{'password'}) ? ('#######') : ('&nbsp;'),
                        checked => $results->[$i]{'checked'},
-                       opacshow => $results->[$i]{'opacshow'},
                        rank => $results->[$i]{'rank'},
                        syntax => $results->[$i]{'syntax'},
                        toggle => $toggle);
@@ -212,5 +193,4 @@ if ($op eq 'add_form') {
                                 nextpage => $offset+$pagesize);
        }
 } #---- END $OP eq DEFAULT
-
 output_html_with_http_headers $input, $cookie, $template->output;