X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Fauthtypes.pl;h=98693724e3876b5fd078bd761084aad5c8dd0472;hb=0bf14c2d3a8e6dfc428065af1630e46aa087d9f1;hp=d36068031acb697e58f0aeb7c1e91e5116991b26;hpb=1161d6e2a01a5f8b691e5e4716bbc1165aa44793;p=koha_fer

diff --git a/admin/authtypes.pl b/admin/authtypes.pl
index d36068031a..98693724e3 100755
--- a/admin/authtypes.pl
+++ b/admin/authtypes.pl
@@ -1,7 +1,6 @@
 #!/usr/bin/perl
-# NOTE: 4-character tabs
 
-#written 20/02/2002 by paul.poulain@free.fr
+# written 20/02/2002 by paul.poulain@free.fr
 # This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html)
 
 # Copyright 2000-2002 Katipo Communications
@@ -17,146 +16,109 @@
 # 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;
 use CGI;
 use C4::Context;
 use C4::Auth;
 use C4::Output;
 
-
 sub StringSearch  {
-    my ($searchstring,$type)=@_;
-    my $dbh = C4::Context->dbh;
-    $searchstring=~ s/\'/\\\'/g;
-    my @data=split(' ',$searchstring);
-    my $count=@data;
-    my $sth=$dbh->prepare("SELECT * FROM auth_types WHERE (authtypecode like ?) ORDER BY authtypecode");
-    $sth->execute("$data[0]%");
-    my @results;
-    while (my $data=$sth->fetchrow_hashref){
-    push(@results,$data);
-    }
-    #  $sth->execute;
-    $sth->finish;
-    return (scalar(@results),\@results);
+    my $sth = C4::Context->dbh->prepare("SELECT * FROM auth_types WHERE (authtypecode like ?) ORDER BY authtypecode");
+    $sth->execute((shift || '') . "%");
+    return $sth->fetchall_arrayref({});
 }
 
 my $input = new CGI;
-my $searchfield=$input->param('authtypecode');
-my $offset=$input->param('offset');
-my $script_name="/cgi-bin/koha/admin/authtypes.pl";
-my $authtypecode=$input->param('authtypecode');
-my $pagesize=20;
-my $op = $input->param('op');
-$searchfield=~ s/\,//g;
+my $script_name  = "/cgi-bin/koha/admin/authtypes.pl";
+my $searchfield  = $input->param('authtypecode');  # FIXME: Auth Type search not really implemented
+my $authtypecode = $input->param('authtypecode');
+my $offset       = $input->param('offset') || 0;
+my $op           = $input->param('op')     || '';
+my $pagesize     = 20;
 my ($template, $borrowernumber, $cookie)
     = get_template_and_user({template_name => "admin/authtypes.tmpl",
                 query => $input,
                 type => "intranet",
                 authnotrequired => 0,
-                flagsrequired => {parameters => 1},
+                flagsrequired => {parameters => 'parameters_remaining_permissions'},
                 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
-}
-################## ADD_FORM ##################################
+$template->param(
+    script_name => $script_name,
+    ($op || 'else') => 1,
+);
+
+my $dbh = C4::Context->dbh;
+
 # called by default. Used to create form to add or  modify a record
 if ($op eq 'add_form') {
-    #start the page and read in includes
     #---- if primkey exists, it's a modify action, so read values to modify...
-    my $data;
     if ($authtypecode) {
-        my $dbh = C4::Context->dbh;
-        my $sth=$dbh->prepare("SELECT * FROM auth_types WHERE authtypecode=?");
+        my $sth = $dbh->prepare("SELECT * FROM auth_types WHERE authtypecode=?");
         $sth->execute($authtypecode);
-        $data=$sth->fetchrow_hashref;
-        $sth->finish;
-        $template->param(authtypecode => $authtypecode,
-                    authtypetext => $data->{'authtypetext'},
-                    auth_tag_to_report => $data->{'auth_tag_to_report'},
-                    summary => $data->{'summary'},
-                    );
+        my $data = $sth->fetchrow_hashref();
+        $template->param(
+            authtypecode       => $authtypecode,
+            authtypetext       => $data->{'authtypetext'},
+            auth_tag_to_report => $data->{'auth_tag_to_report'},
+            summary            => $data->{'summary'},
+        );
     }
                                                     # END $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;
-    if ($input->param('modif')) {
-        my $sth=$dbh->prepare("UPDATE auth_types SET authtypetext=? ,auth_tag_to_report=?, summary=? WHERE authtypecode=?");
-        $sth->execute($input->param('authtypetext'),$input->param('auth_tag_to_report'),$input->param('summary'),$input->param('authtypecode'));
-        $sth->finish;
-    } else {
-        my $sth=$dbh->prepare("INSERT INTO auth_types SET authtypetext=? ,auth_tag_to_report=?, summary=?, authtypecode=?");
-        $sth->execute($input->param('authtypetext'),$input->param('auth_tag_to_report'),$input->param('summary'),$input->param('authtypecode'));
-        $sth->finish;
-    }
-    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authtypes.pl\"></html>";
+    my $sth = $input->param('modif') ? 
+            $dbh->prepare("UPDATE auth_types SET authtypetext=? ,auth_tag_to_report=?, summary=? WHERE authtypecode=?") :
+            $dbh->prepare("INSERT INTO auth_types SET authtypetext=?, auth_tag_to_report=?, summary=?, authtypecode=?") ;
+    $sth->execute($input->param('authtypetext'),$input->param('auth_tag_to_report'),$input->param('summary'),$input->param('authtypecode'));
+    print $input->redirect($script_name);    # 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') {
     #start the page and read in includes
-    my $dbh = C4::Context->dbh;
-
-    my $total = 0;
-    for my $table ('auth_tag_structure') {
-    my $sth=$dbh->prepare("SELECT count(*) AS total FROM $table WHERE authtypecode=?");
+    my $sth=$dbh->prepare("SELECT count(*) AS total FROM auth_tag_structure WHERE authtypecode=?");
     $sth->execute($authtypecode);
-    $total += $sth->fetchrow_hashref->{total};
-    $sth->finish;
-    }
+    my $total = $sth->fetchrow_hashref->{total};
 
-    my $sth=$dbh->prepare("SELECT * FROM auth_types WHERE authtypecode=?");
-    $sth->execute($authtypecode);
-    my $data=$sth->fetchrow_hashref;
-    $sth->finish;
+    my $sth2 = $dbh->prepare("SELECT * FROM auth_types WHERE authtypecode=?");
+    $sth2->execute($authtypecode);
+    my $data = $sth2->fetchrow_hashref;
 
     $template->param(authtypecode => $authtypecode,
-                            authtypetext => $data->{'authtypetext'},
-                            summary => $data->{'summary'},
+                     authtypetext => $data->{'authtypetext'},
+                          summary => $data->{'summary'},
                             total => $total);
                                                     # 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') {
     #start the page and read in includes
-    my $dbh = C4::Context->dbh;
-    my $authtypecode=uc($input->param('authtypecode'));
     my $sth=$dbh->prepare("DELETE FROM auth_types WHERE authtypecode=?");
-    $sth->execute($authtypecode);
-    $sth->finish;
-    print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=authtypes.pl\"></html>";
+    $sth->execute(uc $input->param('authtypecode'));
+    print $input->redirect($script_name);   # FIXME: unnecessary redirect
     exit;
                                                     # END $OP eq DELETE_CONFIRMED
 ################## DEFAULT ##################################
 } else { # DEFAULT
-    my ($count,$results)=StringSearch($searchfield,'web');
-    my $toggle="white";
+    my $results = StringSearch($searchfield);
+    my $count = scalar @$results;
     my @loop_data;
     for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
-        my %row_data;
-        if ($toggle eq 'white'){
-            $row_data{toggle}="#ffffcc";
-        } else {
-            $row_data{toggle}="white";
-        }
-        $row_data{authtypecode} = $results->[$i]{'authtypecode'};
-        $row_data{authtypetext} = $results->[$i]{'authtypetext'};
-        $row_data{auth_tag_to_report} = $results->[$i]{'auth_tag_to_report'};
-        $row_data{summary} = $results->[$i]{'summary'};
-        push(@loop_data, \%row_data);
+        push @loop_data, {
+            authtypecode       => $results->[$i]{'authtypecode'},
+            authtypetext       => $results->[$i]{'authtypetext'},
+            auth_tag_to_report => $results->[$i]{'auth_tag_to_report'},
+            summary            => $results->[$i]{'summary'},
+        };
     }
     $template->param(loop => \@loop_data);
     if ($offset>0) {
@@ -164,12 +126,8 @@ if ($op eq 'add_form') {
         $template->param(previous => "$script_name?offset=".$prevpage);
     }
     if ($offset+$pagesize<$count) {
-        my $nextpage =$offset+$pagesize;
+        my $nextpage = $offset+$pagesize;
         $template->param(next => "$script_name?offset=".$nextpage);
     }
 } #---- END $OP eq DEFAULT
 output_html_with_http_headers $input, $cookie, $template->output;
-
-# Local Variables:
-# tab-width: 4
-# End: