(bug #4295) fix overduerules edition

[koha.git] / tools / overduerules.pl

diff --git a/tools/overduerules.pl b/tools/overduerules.pl
index c0d6e50..7d7e913 100755 (executable)
--- a/tools/overduerules.pl
+++ b/tools/overduerules.pl
@@ -18,12 +18,13 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
+use warnings;
 use CGI;
 use C4::Context;
 use C4::Output;
 use C4::Auth;
 use C4::Koha;
-use C4::Branch; # GetBranches
+use C4::Branch;
 use C4::Letters;
 use C4::Members;
 
@@ -43,6 +44,11 @@ sub blank_row {
     for my $rp (@rule_params) {
         for my $n (1 .. 3) {
             my $key   = "${rp}${n}-$category_code";
+            
+            if (utf8::is_utf8($key)) {
+              utf8::encode($key);
+            }
+            
             my $value = $input->param($key);
             if ($value) {
                 return 0;
@@ -54,11 +60,10 @@ sub blank_row {
 
 my $type=$input->param('type');
 my $branch = $input->param('branch');
-$branch="" unless $branch;
+$branch ||= q{};
 my $op = $input->param('op');
+$op ||= q{};
 
-# my $flagsrequired;
-# $flagsrequired->{circulation}=1;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "tools/overduerules.tmpl",
                             query => $input,
@@ -81,11 +86,17 @@ if ($op eq 'save') {
     my $sth_delete=$dbh->prepare("DELETE FROM overduerules WHERE branchcode=? AND categorycode=?");
     foreach my $key (@names){
             # ISSUES
-            if ($key =~ /(.*)([1-3])-(.*)/) {
+            if ($key =~ /(delay|letter|debarred)([1-3])-(.*)/) {
                     my $type = $1; # data type
                     my $num = $2; # From 1 to 3
                     my $bor = $3; # borrower category
-                    $temphash{$bor}->{"$type$num"}=$input->param("$key") if (($input->param("$key") ne "") or ($input->param("$key")>0));
+                    my $value = $input->param($key);
+                    if ($type eq 'delay') {
+                        $temphash{$bor}->{"$type$num"} = ($value =~ /^\d+$/ && int($value) > 0) ? int($value) : '';
+                    } else {
+                        # type is letter
+                        $temphash{$bor}->{"$type$num"} = $value if $value ne '';
+                    }
             }
     }
 
@@ -166,20 +177,11 @@ if ($op eq 'save') {
         $input_saved = 1;
     }
 }
-my $branches = GetBranches();
-my @branchloop;
-foreach my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
-        my $selected = 1 if $thisbranch eq $branch;
-        my %row =(value => $thisbranch,
-                                selected => $selected,
-                                branchname => $branches->{$thisbranch}->{'branchname'},
-                        );
-        push @branchloop, \%row;
-}
+my $branchloop = GetBranchesLoop($branch);
 
 my $letters = GetLetters("circulation");
 
-my $countletters = scalar $letters;
+my $countletters = keys %{$letters};
 
 my @line_loop;
 
@@ -199,7 +201,11 @@ for my $data (@categories) {
             if ($countletters){
                 my @letterloop;
                 foreach my $thisletter (sort { $letters->{$a} cmp $letters->{$b} } keys %$letters) {
-                    my $selected = 1 if $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"};
+                    my $selected;
+                    if ( $temphash{$data->{categorycode}}->{"letter$i"} &&
+                        $thisletter eq $temphash{$data->{'categorycode'}}->{"letter$i"}) {
+                        $selected = 1;
+                    }
                     my %letterrow =(value => $thisletter,
                                     selected => $selected,
                                     lettername => $letters->{$thisletter},
@@ -221,7 +227,10 @@ for my $data (@categories) {
             if ($countletters){
                 my @letterloop;
                 foreach my $thisletter (sort { $letters->{$a} cmp $letters->{$b} } keys %$letters) {
-                    my $selected = 1 if $thisletter eq $dat->{"letter$i"};
+                    my $selected;
+                    if ($dat->{"letter$i"} && $thisletter eq $dat->{"letter$i"}) {
+                        $selected = 1;
+                    }
                     my %letterrow =(value => $thisletter,
                                     selected => $selected,
                                     lettername => $letters->{$thisletter},
@@ -236,12 +245,11 @@ for my $data (@categories) {
             if ($dat->{"delay$i"}){$row{"delay$i"}=$dat->{"delay$i"};}
             if ($dat->{"debarred$i"}){$row{"debarred$i"}=$dat->{"debarred$i"};}
         }
-        $sth2->finish;
     }
     push @line_loop,\%row;
 }
 
 $template->param(table=> \@line_loop,
-                branchloop => \@branchloop,
+                branchloop => $branchloop,
                 branch => $branch);
 output_html_with_http_headers $input, $cookie, $template->output;