Bugzilla – Attachment 44177 Details for
Bug 14589
Adjust authorities_merge_ajax and replace some indirect syntax
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[SIGNED-OFF] Bug 14589: Adjust authorities_merge_ajax and replace some indirect syntax
SIGNED-OFF-Bug-14589-Adjust-authoritiesmergeajax-a.patch (text/plain), 5.83 KB, created by
Bernardo Gonzalez Kriegel
on 2015-10-29 18:23:47 UTC
(
hide
)
Description:
[SIGNED-OFF] Bug 14589: Adjust authorities_merge_ajax and replace some indirect syntax
Filename:
MIME Type:
Creator:
Bernardo Gonzalez Kriegel
Created:
2015-10-29 18:23:47 UTC
Size:
5.83 KB
patch
obsolete
>From b5619acab58b6dd24066e6564dafe26149b9dab4 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Wed, 22 Jul 2015 14:41:42 +0200 >Subject: [PATCH] [SIGNED-OFF] Bug 14589: Adjust authorities_merge_ajax and > replace some indirect syntax > >This patch does the following: >[1] Adjust authorities_merge_ajax just as in bug 14588. >[2] Replace some indirect syntax for fetch GGI::Cookie. >[3] Along the way replace some new CGI's. Note that I am not aiming to > replace them Koha wide. The "fetch class" variant is less readable. > >NOTE: The changes to tools/upload-file.pl and upload-file-progress.pl >are moved to report 14321. > >Test plan: >[1] Run the URL authorities/merge_ajax.pl in staff. >[2] Upload a file with Stage MARC records for import. > >Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com> >[1] It runs, but also before patch >[2] File uploads without problem >No errors >--- > acqui/check_duplicate_barcode_ajax.pl | 2 +- > authorities/merge_ajax.pl | 12 +++++------- > opac/opac-patron-image.pl | 2 +- > opac/opac-ratings-ajax.pl | 2 +- > opac/opac-tags.pl | 2 +- > tags/review.pl | 2 +- > tools/background-job-progress.pl | 6 +++--- > 7 files changed, 13 insertions(+), 15 deletions(-) > >diff --git a/acqui/check_duplicate_barcode_ajax.pl b/acqui/check_duplicate_barcode_ajax.pl >index 6a05814..fcd85fe 100755 >--- a/acqui/check_duplicate_barcode_ajax.pl >+++ b/acqui/check_duplicate_barcode_ajax.pl >@@ -30,7 +30,7 @@ my $input = new CGI; > print $input->header('application/json'); > > # Check the user's permissions >-my %cookies = fetch CGI::Cookie; >+my %cookies = CGI::Cookie->fetch; > my $sessid = $cookies{'CGISESSID'}->value || $input->param('CGISESSID'); > my ($auth_status, $auth_sessid) = C4::Auth::check_cookie_auth($sessid, {acquisition => 'order_manage'}); > if ($auth_status ne "ok") { >diff --git a/authorities/merge_ajax.pl b/authorities/merge_ajax.pl >index 458b4c9..39796b0 100755 >--- a/authorities/merge_ajax.pl >+++ b/authorities/merge_ajax.pl >@@ -4,23 +4,21 @@ use strict; > use warnings; > > use CGI qw ( -utf8 ); >-use CGI::Session; >+use CGI::Cookie; # need to check cookies before CGI parses the POST request >+use JSON; >+ > use C4::Context; > use C4::Auth qw/check_cookie_auth/; > use C4::AuthoritiesMarc; >-use JSON; >-use CGI::Cookie; # need to check cookies before >- # having CGI parse the POST request > >-my %cookies = fetch CGI::Cookie; >+my %cookies = CGI::Cookie->fetch; > my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value, { editcatalogue => 'edit_catalogue' }); >+my $reply = CGI->new; > if ($auth_status ne "ok") { >- my $reply = CGI->new(""); > print $reply->header(-type => 'text/html'); > exit 0; > } > >-my $reply = new CGI; > my $framework = $reply->param('frameworkcode'); > my $tagslib = GetTagsLabels(1, $framework); > print $reply->header(-type => 'text/html'); >diff --git a/opac/opac-patron-image.pl b/opac/opac-patron-image.pl >index 993969f..0845bf1 100755 >--- a/opac/opac-patron-image.pl >+++ b/opac/opac-patron-image.pl >@@ -33,7 +33,7 @@ unless (C4::Context->preference('OPACpatronimages')) { > } > > my $needed_flags; >-my %cookies = fetch CGI::Cookie; >+my %cookies = CGI::Cookie->fetch; > my $sessid = $cookies{'CGISESSID'}->value; > my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags); > my $borrowernumber = C4::Context->userenv->{'number'}; >diff --git a/opac/opac-ratings-ajax.pl b/opac/opac-ratings-ajax.pl >index 97a5aa1..1b91caf 100755 >--- a/opac/opac-ratings-ajax.pl >+++ b/opac/opac-ratings-ajax.pl >@@ -106,7 +106,7 @@ exit; > # a ratings specific ajax return sub, returns CGI object, and an 'auth_success' value > sub ajax_auth_cgi { > my $needed_flags = shift; >- my %cookies = fetch CGI::Cookie; >+ my %cookies = CGI::Cookie->fetch; > my $input = CGI->new; > my $sessid = $cookies{'CGISESSID'}->value || $input->param('CGISESSID'); > my ( $auth_status, $auth_sessid ) = >diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl >index 4f97896..e7f892c 100755 >--- a/opac/opac-tags.pl >+++ b/opac/opac-tags.pl >@@ -57,7 +57,7 @@ my @globalErrorIndexes = (); > > sub ajax_auth_cgi { # returns CGI object > my $needed_flags = shift; >- my %cookies = fetch CGI::Cookie; >+ my %cookies = CGI::Cookie->fetch; > my $input = CGI->new; > my $sessid = $cookies{'CGISESSID'}->value; > my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags); >diff --git a/tags/review.pl b/tags/review.pl >index 3ea36db..1f9bddb 100755 >--- a/tags/review.pl >+++ b/tags/review.pl >@@ -39,7 +39,7 @@ my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more spec > > sub ajax_auth_cgi ($) { # returns CGI object > my $needed_flags = shift; >- my %cookies = fetch CGI::Cookie; >+ my %cookies = CGI::Cookie->fetch; > my $input = CGI->new; > my $sessid = $cookies{'CGISESSID'}->value; > my ($auth_status, $auth_sessid) = check_cookie_auth($sessid, $needed_flags); >diff --git a/tools/background-job-progress.pl b/tools/background-job-progress.pl >index a5fc47d..811f5b2 100755 >--- a/tools/background-job-progress.pl >+++ b/tools/background-job-progress.pl >@@ -30,8 +30,8 @@ use C4::BackgroundJob; > use CGI::Cookie; # need to check cookies before > # having CGI parse the POST request > >-my $input = new CGI; >-my %cookies = fetch CGI::Cookie; >+my $input = CGI->new; >+my %cookies = CGI::Cookie->fetch; > my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value, { tools => '*' }); > if ($auth_status ne "ok") { > my $reply = CGI->new(""); >@@ -51,7 +51,7 @@ if (defined $job) { > $job_status = $job->status(); > } > >-my $reply = CGI->new(""); >+my $reply = CGI->new; > print $reply->header(-type => 'text/html'); > # response will be sent back as JSON > print '{"progress":"' . $reported_progress . '","job_size":"' . $job_size . '","job_status":"' . $job_status . '"}'; >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 14589
:
41125
|
41457
|
41675
|
41691
|
41882
|
41883
|
44177
|
44187