From e97ce49ba7752b5278c2ea2262401ab6690f211e Mon Sep 17 00:00:00 2001 From: Jasmine Amohia Date: Tue, 15 Jan 2019 03:30:52 +0000 Subject: [PATCH] Bug 22036: Indented code where '^I' was written rather than an indent. Code was previously written with '^I' where an indent was supposed to be. I deleted all '^I's and replaced them with indents. To find this change: Look at the tags/review.pl file and confirm indentation is correct Signed-off-by: Owen Leonard Signed-off-by: Tomas Cohen Arazi Signed-off-by: Nick Clemens (cherry picked from commit c29512266dd72991afb6f43e29e37f5db29d0c7b) Signed-off-by: Martin Renvoize --- tags/review.pl | 220 ++++++++++++++++++++++++------------------------- 1 file changed, 110 insertions(+), 110 deletions(-) diff --git a/tags/review.pl b/tags/review.pl index 353e741994..43718fc408 100755 --- a/tags/review.pl +++ b/tags/review.pl @@ -23,7 +23,7 @@ use Modern::Perl; use Data::Dumper; use POSIX; use CGI qw ( -utf8 ); -use CGI::Cookie; # need to check cookies before having CGI parse the POST request +use CGI::Cookie; # need to check cookies before having CGI parse the POST request use URI::Escape; use C4::Auth qw(:DEFAULT check_cookie_auth); use C4::Context; @@ -34,44 +34,44 @@ use C4::Debug; use C4::Tags qw(get_tags get_approval_rows approval_counts whitelist blacklist is_approved); my $script_name = "/cgi-bin/koha/tags/review.pl"; -my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more specific permission is created. +my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more specific permission is created. -sub ajax_auth_cgi ($) { # returns CGI object - my $needed_flags = shift; +sub ajax_auth_cgi ($) { # returns CGI object + my $needed_flags = shift; my %cookies = CGI::Cookie->fetch; - my $input = CGI->new; + my $input = CGI->new; my $sessid = $cookies{'CGISESSID'}->value; - my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags); - $debug and - print STDERR "($auth_status, $auth_sessid) = check_cookie_auth($sessid," . Dumper($needed_flags) . ")\n"; - if ($auth_status ne "ok") { - output_with_http_headers $input, undef, - "window.alert('Your CGI session cookie ($sessid) is not current. " . - "Please refresh the page and try again.');\n", 'js'; - exit 0; - } - $debug and print STDERR "AJAX request: " . Dumper($input), - "\n(\$auth_status,\$auth_sessid) = ($auth_status,$auth_sessid)\n"; - return $input; + my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags); + $debug and + print STDERR "($auth_status, $auth_sessid) = check_cookie_auth($sessid," . Dumper($needed_flags) . ")\n"; + if ($auth_status ne "ok") { + output_with_http_headers $input, undef, + "window.alert('Your CGI session cookie ($sessid) is not current. " . + "Please refresh the page and try again.');\n", 'js'; + exit 0; + } + $debug and print STDERR "AJAX request: " . Dumper($input), + "\n(\$auth_status,\$auth_sessid) = ($auth_status,$auth_sessid)\n"; + return $input; } if (is_ajax()) { - my $input = &ajax_auth_cgi($needed_flags); - my $operator = C4::Context->userenv->{'number'}; # must occur AFTER auth - $debug and print STDERR "op: " . Dumper($operator) . "\n"; - my ($tag, $js_reply); - if ($tag = $input->param('test')) { - my $check = is_approved($tag); + my $input = &ajax_auth_cgi($needed_flags); + my $operator = C4::Context->userenv->{'number'}; # must occur AFTER auth + $debug and print STDERR "op: " . Dumper($operator) . "\n"; + my ($tag, $js_reply); + if ($tag = $input->param('test')) { + my $check = is_approved($tag); $js_reply = ( $check >= 1 ? 'success' : $check <= -1 ? 'failure' : 'indeterminate' ) . "_test('".uri_escape_utf8($tag)."');\n"; - } - if ($tag = $input->param('ok')) { + } + if ($tag = $input->param('ok')) { $js_reply = ( whitelist($operator,$tag) ? 'success' : 'failure') . "_approve('".uri_escape_utf8($tag)."');\n"; - } - if ($tag = $input->param('rej')) { + } + if ($tag = $input->param('rej')) { $js_reply = ( blacklist($operator,$tag) ? 'success' : 'failure') . "_reject('".uri_escape_utf8($tag)."');\n"; - } - output_with_http_headers $input, undef, $js_reply, 'js'; - exit; + } + output_with_http_headers $input, undef, $js_reply, 'js'; + exit; } ### Below is the sad, boring, necessary non-AJAX HTML code. @@ -98,129 +98,129 @@ $op ||= 'none'; @tags = $input->multi_param('tags'); $borrowernumber == 0 and push @errors, {op_zero=>1}; - if ($op eq 'approve') { - foreach (@tags) { - whitelist($borrowernumber,$_) or push @errors, {failed_ok=>$_}; - } +if ($op eq 'approve') { + foreach (@tags) { + whitelist($borrowernumber,$_) or push @errors, {failed_ok=>$_}; + } } elsif ($op eq 'reject' ) { - foreach (@tags) { - blacklist($borrowernumber,$_) or push @errors, {failed_rej=>$_}; - } + foreach (@tags) { + blacklist($borrowernumber,$_) or push @errors, {failed_rej=>$_}; + } } elsif ($op eq 'test' ) { - my $tag = $input->param('test'); - push @tags, $tag; - my $check = is_approved($tag); - $template->param( - test_term => $tag, - ( $check >= 1 ? 'verdict_ok' : - $check <= -1 ? 'verdict_rej' : 'verdict_indeterminate' ) => 1, - ); + my $tag = $input->param('test'); + push @tags, $tag; + my $check = is_approved($tag); + $template->param( + test_term => $tag, + ( $check >= 1 ? 'verdict_ok' : + $check <= -1 ? 'verdict_rej' : 'verdict_indeterminate' ) => 1, + ); } my $counts = &approval_counts; foreach (keys %$counts) { - $template->param($_ => $counts->{$_}); + $template->param($_ => $counts->{$_}); } sub pagination_calc ($;$) { - my $query = shift or return undef; - my $hardlimit = (@_) ? shift : 100; # hardcoded, could be another syspref - my $pagesize = $query->param('limit' ) || $hardlimit; - my $page = $query->param('page' ) || 1; - my $offset = $query->param('offset') || 0; - ($pagesize <= $hardlimit) or $pagesize = $hardlimit; - if ($page > 1) { - $offset = ($page-1)*$pagesize; - } else { - $page = 1; - } - return ($pagesize,$page,$offset); + my $query = shift or return undef; + my $hardlimit = (@_) ? shift : 100; # hardcoded, could be another syspref + my $pagesize = $query->param('limit' ) || $hardlimit; + my $page = $query->param('page' ) || 1; + my $offset = $query->param('offset') || 0; + ($pagesize <= $hardlimit) or $pagesize = $hardlimit; + if ($page > 1) { + $offset = ($page-1)*$pagesize; + } else { + $page = 1; + } + return ($pagesize,$page,$offset); } my ($pagesize,$page,$offset) = pagination_calc($input,100); my %filters = ( - limit => $offset ? "$offset,$pagesize" : $pagesize, - sort => 'approved,-weight_total,+term', + limit => $offset ? "$offset,$pagesize" : $pagesize, + sort => 'approved,-weight_total,+term', ); my ($filter,$date_from,$date_to); if (defined $input->param('approved')) { # 0 is valid value, must check defined - $filter = $input->param('approved'); + $filter = $input->param('approved'); } else { - $filter = 0; + $filter = 0; } if ($filter eq 'all') { - $template->param(filter_approved_all => 1); + $template->param(filter_approved_all => 1); } elsif ($filter =~ /-?[01]/) { - $filters{approved} = $filter; - $template->param( - ($filter == 1 ? 'filter_approved_ok' : - $filter == 0 ? 'filter_approved_pending' : - $filter == -1 ? 'filter_approved_rej' : - 'filter_approved') => 1 - ); + $filters{approved} = $filter; + $template->param( + ($filter == 1 ? 'filter_approved_ok' : + $filter == 0 ? 'filter_approved_pending' : + $filter == -1 ? 'filter_approved_rej' : + 'filter_approved') => 1 + ); } # my $q_count = get_approval_rows({limit=>$pagesize, sort=>'approved,-weight_total,+term', count=>1}); if ($filter = $input->param('tag')) { - $template->param(filter_tag=>$filter); - $filters{term} = $filter; + $template->param(filter_tag=>$filter); + $filters{term} = $filter; } if ($filter = $input->param('from')) { $date_from = eval { output_pref( { dt => dt_from_string( $filter ), dateonly => 1, dateformat => 'iso' } ); }; if ( $date_from ) { - $template->param(filter_date_approved_from=>$filter); - $filters{date_approved} = ">=$date_from"; - } else { - push @errors, {date_from=>$filter}; - } + $template->param(filter_date_approved_from=>$filter); + $filters{date_approved} = ">=$date_from"; + } else { + push @errors, {date_from=>$filter}; + } } if ($filter = $input->param('to')) { $date_to = eval { output_pref( { dt => dt_from_string( $filter ), dateonly => 1, dateformat => 'iso' } ); }; if ( $date_to ) { - $template->param(filter_date_approved_to=>$filter); - $filters{date_approved} = "<=$date_to"; - } else { - push @errors, {date_to=>$filter}; - } + $template->param(filter_date_approved_to=>$filter); + $filters{date_approved} = "<=$date_to"; + } else { + push @errors, {date_to=>$filter}; + } } -if ($filter = $input->param('approver')) { # name (or borrowernumber) from input box - if ($filter =~ /^\d+$/ and $filter > 0) { - # $filter=get borrowernumber from name - # FIXME: get borrowernumber from name not implemented. - $template->param(filter_approver=>$filter); - $filters{approved_by} = $filter; - } else { - push @errors, {approver=>$filter}; - } +if ($filter = $input->param('approver')) { # name (or borrowernumber) from input box + if ($filter =~ /^\d+$/ and $filter > 0) { + # $filter=get borrowernumber from name + # FIXME: get borrowernumber from name not implemented. + $template->param(filter_approver=>$filter); + $filters{approved_by} = $filter; + } else { + push @errors, {approver=>$filter}; + } } -if ($filter = $input->param('approved_by')) { # borrowernumber from link - if ($filter =~ /^\d+$/ and $filter > 0) { - $template->param(filter_approver=>$filter); - $filters{approved_by} = $filter; - } else { - push @errors, {approved_by=>$filter}; - } +if ($filter = $input->param('approved_by')) { # borrowernumber from link + if ($filter =~ /^\d+$/ and $filter > 0) { + $template->param(filter_approver=>$filter); + $filters{approved_by} = $filter; + } else { + push @errors, {approved_by=>$filter}; + } } $debug and print STDERR "filters: " . Dumper(\%filters); my $tagloop = get_approval_rows(\%filters); my $qstring = $input->query_string; -$qstring =~ s/([&;])*\blimit=\d+//; # remove pagination var -$qstring =~ s/^;+//; # remove leading delims +$qstring =~ s/([&;])*\blimit=\d+//; # remove pagination var +$qstring =~ s/^;+//; # remove leading delims $qstring = "limit=$pagesize" . ($qstring ? '&' . $qstring : ''); $debug and print STDERR "number of approval_rows: " . scalar(@$tagloop) . "rows\n"; (scalar @errors) and $template->param(message_loop=>\@errors); $template->param( - offset => $offset, # req'd for EXPR - op => $op, - op_count => scalar(@tags), - script_name => $script_name, - approved => 0, # dummy value (also EXPR) - tagloop => $tagloop, - pagination_bar => pagination_bar( - "$script_name?$qstring\&", - ceil($counts->{approved_total}/$pagesize), # $page, 'page' - ) + offset => $offset, # req'd for EXPR + op => $op, + op_count => scalar(@tags), + script_name => $script_name, + approved => 0, # dummy value (also EXPR) + tagloop => $tagloop, + pagination_bar => pagination_bar( + "$script_name?$qstring\&", + ceil($counts->{approved_total}/$pagesize), # $page, 'page' + ) ); output_html_with_http_headers $input, $cookie, $template->output; -- 2.39.5