#1455 (placing reserve from OPAC)

[koha_gimpoz] / admin / categorie.pl

diff --git a/admin/categorie.pl b/admin/categorie.pl
index 1453236..886260a 100755 (executable)
--- a/admin/categorie.pl
+++ b/admin/categorie.pl
@@ -39,14 +39,11 @@
 use strict;
 use CGI;
 use C4::Context;
-use C4::Output;
-use C4::Search;
-use HTML::Template;
 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);
@@ -73,7 +70,7 @@ my ($template, $loggedinuser, $cookie)
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {parameters => 1, management => 1},
+                            flagsrequired => {parameters => 1},
                             debug => 1,
                             });
 
@@ -107,17 +104,24 @@ if ($op eq 'add_form') {
                                issuelimit              => $data->{'issuelimit'},
                                reservefee              => sprintf("%.2f",$data->{'reservefee'}),
                                category_type           => $data->{'category_type'},
-                               "type_".$data->{'category_type'} => " SELECTED ",
+                               "type_".$data->{'category_type'} => 1,
                                );
                                                                                                        # END $OP eq ADD_FORM
 ################## ADD_VALIDATE ##################################
 # called by add_form, used to insert/modify data in DB
 } elsif ($op eq 'add_validate') {
        $template->param(add_validate => 1);
+       my $is_a_modif = $input->param("is_a_modif");
        my $dbh = C4::Context->dbh;
-       my $sth=$dbh->prepare("replace categories (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?)");
-       $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
-       $sth->finish;
+       if ($is_a_modif) {
+            my $sth=$dbh->prepare("UPDATE categories SET description=?,enrolmentperiod=?,upperagelimit=?,dateofbirthrequired=?,enrolmentfee=?,reservefee=?,overduenoticerequired=?,category_type=? WHERE categorycode=?");
+            $sth->execute(map { $input->param($_) } ('description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type','categorycode'));
+            $sth->finish;
+        } else {
+            my $sth=$dbh->prepare("INSERT INTO categories  (categorycode,description,enrolmentperiod,upperagelimit,dateofbirthrequired,enrolmentfee,reservefee,overduenoticerequired,category_type) values (?,?,?,?,?,?,?,?,?)");
+            $sth->execute(map { $input->param($_) } ('categorycode','description','enrolmentperiod','upperagelimit','dateofbirthrequired','enrolmentfee','reservefee','overduenoticerequired','category_type'));
+            $sth->finish;
+        }
        print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=categorie.pl\"></html>";
        exit;
 
@@ -150,7 +154,7 @@ if ($op eq 'add_form') {
                                 overduenoticerequired   => $data->{'overduenoticerequired'},
                                 issuelimit              => $data->{'issuelimit'},
                                 reservefee              =>  sprintf("%.2f",$data->{'reservefee'}),
-                                category_type           => $data->{'category_type'}
+                                category_type           => $data->{'category_type'},
                                 );
                                                                                                        # END $OP eq DELETE_CONFIRM
 ################## DELETE_CONFIRMED ##################################
@@ -168,9 +172,8 @@ if ($op eq 'add_form') {
                                                                                                        # END $OP eq DELETE_CONFIRMED
 } else { # DEFAULT
        $template->param(else => 1);
-       my $env;
        my @loop;
-       my ($count,$results)=StringSearch($env,$searchfield,'web');
+       my ($count,$results)=StringSearch($searchfield,'web');
        my $toggle = 0;
        for (my $i=0; $i < $count; $i++){
                my %row = (categorycode => $results->[$i]{'categorycode'},
@@ -183,7 +186,8 @@ if ($op eq 'add_form') {
                                issuelimit => $results->[$i]{'issuelimit'},
                                reservefee => sprintf("%.2f",$results->[$i]{'reservefee'}),
                                category_type => $results->[$i]{'category_type'},
-                               toggle => $toggle );    
+                               "type_".$results->[$i]{'category_type'} => 1,
+                               toggle => $toggle );
                push @loop, \%row;
                if ( $toggle eq 0 )
                {
@@ -211,6 +215,9 @@ if ($op eq 'add_form') {
 } #---- END $OP eq DEFAULT
 
 
-
+$template->param(intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
+               intranetstylesheet => C4::Context->preference("intranetstylesheet"),
+               IntranetNav => C4::Context->preference("IntranetNav"),
+               );
 output_html_with_http_headers $input, $cookie, $template->output;