gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 20687: (follow-up) Look for invitekey in show_accept and fix error codes 

We should check the invitekey in show_accept by passing it along in the
search call.
On the way I fixed some error checking: if the list number is invalid, or
the list is public or you are the owner, or if the key is not found, we
should set the right error code; the template contains those messages.

Test plan:
[1] Share a list and accept a correct invitation with another user.
[2] Try to accept some invalid proposals: wrong key, wrong list.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested invalid key, wrong list, owner, public list, expiry.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 7ecc125786)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Marcel de Rooy 2018-05-04 08:10:46 +02:00 committed by Fridolin Somers
parent b7884c7fad
commit 2fac63ae09
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
opac/opac-shareshelf.pl
View File

@ -125,42 +125,38 @@ sub show_accept {
my $shelfnumber = $param->{shelfnumber};
my $shelf = Koha::Virtualshelves->find( $shelfnumber );
# The key for accepting is checked later in Koha::Virtualshelf->share
# The key for accepting is checked later in Koha::Virtualshelfshare
# You must not be the owner and the list must be private
if ( $shelf->category == 2 or $shelf->owner == $param->{loggedinuser} ) {
return;
if( !$shelf ) {
$param->{errcode} = 2;
} elsif( $shelf->category == 2 ) {
$param->{errcode} = 5;
} elsif( $shelf->owner == $param->{loggedinuser} ) {
$param->{errcode} = 8;
}
return if $param->{errcode};
# We could have used ->find with the share id, but we don't want to change
# the url sent to the patron
my $shared_shelves = Koha::Virtualshelfshares->search(
{
shelfnumber => $param->{shelfnumber},
},
{
order_by => { -desc => 'sharedate' },
# Look for shelfnumber and invitekey in shares, expiration check later
my $key = keytostring( stringtokey( $param->{key}, 0 ), 1 );
my $shared_shelves = Koha::Virtualshelfshares->search({
shelfnumber => $param->{shelfnumber},
invitekey => $key,
});
my $shared_shelf = $shared_shelves ? $shared_shelves->next : undef; # we pick the first, but there should only be one
if ( $shared_shelf ) {
my $is_accepted = eval { $shared_shelf->accept( $key, $param->{loggedinuser} ) };
if( $is_accepted ) {
notify_owner($param);
#redirect to view of this shared list
print $param->{query}->redirect(
-uri => SHELVES_URL . $param->{shelfnumber},
-cookie => $param->{cookie}
);
exit;
}
);
if ( $shared_shelves ) {
my $key = keytostring( stringtokey( $param->{key}, 0 ), 1 );
while ( my $shared_shelf = $shared_shelves->next ) {
my $is_accepted = eval { $shared_shelf->accept( $key, $param->{loggedinuser} ) };
if ( $is_accepted ) {
notify_owner($param);
#redirect to view of this shared list
print $param->{query}->redirect(
-uri => SHELVES_URL . $param->{shelfnumber},
-cookie => $param->{cookie}
);
exit;
}
}
$param->{errcode} = 7; #not accepted (key not found or expired)
} else {
# This shelf is not shared
}
$param->{errcode} = 7; # not accepted: key invalid or expired
}
sub notify_owner {