Bug 8895 - Warning in systempreferences.pl: Use of uninitialized value in length...

[koha.git] / admin / authorised_values.pl

diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl
index 32acb5b..17917ce 100755 (executable)
--- a/admin/authorised_values.pl
+++ b/admin/authorised_values.pl
@@ -27,7 +27,7 @@ use C4::Koha;
 use C4::Output;
 
 
-sub AuthorizedValuesForCategory ($) {
+sub AuthorizedValuesForCategory {
     my ($searchstring) = shift or return;
     my $dbh = C4::Context->dbh;
     $searchstring=~ s/\'/\\\'/g;
@@ -45,26 +45,21 @@ sub AuthorizedValuesForCategory ($) {
 my $input = new CGI;
 my $id          = $input->param('id');
 my $op          = $input->param('op')     || '';
-my $offset      = $input->param('offset') || 0;
-my $searchfield = $input->param('searchfield');
+our $offset      = $input->param('offset') || 0;
+our $searchfield = $input->param('searchfield');
 $searchfield = '' unless defined $searchfield;
 $searchfield =~ s/\,//g;
-my $script_name = "/cgi-bin/koha/admin/authorised_values.pl";
-my $dbh = C4::Context->dbh;
+our $script_name = "/cgi-bin/koha/admin/authorised_values.pl";
+our $dbh = C4::Context->dbh;
 
-# my $subpermission = C4::Context->preference('GranularPermissions') ? 
-#     { editcatalogue => ... } :
-#     {    parameters => 1   } ;
-
-my ($template, $borrowernumber, $cookie)= get_template_and_user({
+our ($template, $borrowernumber, $cookie)= get_template_and_user({
     template_name => "admin/authorised_values.tmpl",
     authnotrequired => 0,
-    flagsrequired => {parameters => 1},     # soon $subpermission
+    flagsrequired => {parameters => 'parameters_remaining_permissions'},
     query => $input,
     type => "intranet",
     debug => 1,
 });
-my $pagesize = 20;
 
 $template->param(  script_name => $script_name,
                  ($op||'else') => 1 );
@@ -81,15 +76,15 @@ if ($op eq 'add_form') {
        }
        if ($id) {
                $template->param(action_modify => 1);
-               $template->param('heading-modify-authorized-value-p' => 1);
+               $template->param('heading_modify_authorized_value_p' => 1);
        } elsif ( ! $data->{'category'} ) {
                $template->param(action_add_category => 1);
-               $template->param('heading-add-new-category-p' => 1);
+               $template->param('heading_add_new_category_p' => 1);
        } else {
                $template->param(action_add_value => 1);
-               $template->param('heading-add-authorized-value-p' => 1);
+               $template->param('heading_add_authorized_value_p' => 1);
        }
-       $template->param('use-heading-flags-p' => 1);
+       $template->param('use_heading_flags_p' => 1);
        $template->param( category        => $data->{'category'},
                          authorised_value => $data->{'authorised_value'},
                          lib              => $data->{'lib'},
@@ -109,15 +104,14 @@ if ($op eq 'add_form') {
     my $duplicate_entry = 0;
 
     if ( $id ) { # Update
-        my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id='$id' ");
-        $sth->execute();
+        my $sth = $dbh->prepare( "SELECT category, authorised_value FROM authorised_values WHERE id = ? ");
+        $sth->execute($id);
         my ($category, $authorised_value) = $sth->fetchrow_array();
         if ( $authorised_value ne $new_authorised_value ) {
             my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
-                "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' and id<>$id");
-            $sth->execute();
+                "WHERE category = ? AND authorised_value = ? and id <> ? ");
+            $sth->execute($new_category, $new_authorised_value, $id);
             ($duplicate_entry) = $sth->fetchrow_array();
-            warn "**** duplicate_entry = $duplicate_entry";
         }
         unless ( $duplicate_entry ) {
             my $sth=$dbh->prepare( 'UPDATE authorised_values
@@ -138,8 +132,8 @@ if ($op eq 'add_form') {
     }
     else { # Insert
         my $sth = $dbh->prepare_cached( "SELECT COUNT(*) FROM authorised_values " .
-            "WHERE category = '$new_category' AND authorised_value = '$new_authorised_value' ");
-        $sth->execute();
+            "WHERE category = ? AND authorised_value = ? ");
+        $sth->execute($new_category, $new_authorised_value);
         ($duplicate_entry) = $sth->fetchrow_array();
         unless ( $duplicate_entry ) {
             my $sth=$dbh->prepare( 'INSERT INTO authorised_values
@@ -194,17 +188,18 @@ output_html_with_http_headers $input, $cookie, $template->output;
 exit 0;
 
 sub default_form {
-       # build categories list
-       my $sth = $dbh->prepare("select distinct category from authorised_values");
-       $sth->execute;
-       my @category_list;
-       my %categories;     # a hash, to check that some hardcoded categories exist.
-       while ( my ($category) = $sth->fetchrow_array) {
-               push(@category_list,$category);
-               $categories{$category} = 1;
-       }
-       # push koha system categories
-    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST)) {
+    # build categories list
+    my $sth = $dbh->prepare("select distinct category from authorised_values");
+    $sth->execute;
+    my @category_list;
+    my %categories;    # a hash, to check that some hardcoded categories exist.
+    while ( my ($category) = $sth->fetchrow_array ) {
+        push( @category_list, $category );
+        $categories{$category} = 1;
+    }
+
+    # push koha system categories
+    foreach (qw(Asort1 Asort2 Bsort1 Bsort2 SUGGEST DAMAGED LOST REPORT_GROUP REPORT_SUBGROUP)) {
         push @category_list, $_ unless $categories{$_};
     }
 
@@ -224,7 +219,7 @@ sub default_form {
     my $count = scalar(@$results);
        my @loop_data = ();
        # builds value list
-       for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){
+       for (my $i=0; $i < $count; $i++){
                my %row_data;  # get a fresh hash for the row data
                $row_data{category}              = $results->[$i]{'category'};
                $row_data{authorised_value}      = $results->[$i]{'authorised_value'};
@@ -239,19 +234,5 @@ sub default_form {
        $template->param( loop     => \@loop_data,
                           tab_list => $tab_list,
                           category => $searchfield );
-
-       if ($offset>0) {
-               my $prevpage = $offset-$pagesize;
-               $template->param(isprevpage => $offset,
-                                               prevpage=> $prevpage,
-                                               searchfield => $searchfield,
-                );
-       }
-       if ($offset+$pagesize<$count) {
-               my $nextpage =$offset+$pagesize;
-               $template->param(nextpage =>$nextpage,
-                                               searchfield => $searchfield,
-               );
-       }
 }