Bug 37247: Fix subscriptions operation allowed without authentication
Move close and reopen after get_template_and_user(). Also move Koha::Subscriptions->find(), not a good idea to run DB queries before authentication. Test plan : 1) Apply patch 2) Authenticate to staff interface 3) Go to an existing open subscription 4) Open a new browser tab and use it to log-out 5) Go to first tab and click on 'Close' 6) You get login page 7) Authenticate 8) Check subscription is not closed 9) Check you can close and reopen subscription Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz> Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> (cherry picked from commit 42c2dd78ef52ec00afd6307ef179c491615c7085) Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
This commit is contained in:
parent
f55c0039bd
commit
45007a58e2
|
|
@ -34,16 +34,10 @@ use Carp qw( carp );
|
|||
use Koha::SharedContent;
|
||||
|
||||
my $query = CGI->new;
|
||||
my $op = $query->param('op') || q{};
|
||||
my $issueconfirmed = $query->param('issueconfirmed');
|
||||
my $dbh = C4::Context->dbh;
|
||||
my $subscriptionid = $query->param('subscriptionid');
|
||||
|
||||
if ( $op and $op eq "close" ) {
|
||||
C4::Serials::CloseSubscription( $subscriptionid );
|
||||
} elsif ( $op and $op eq "reopen" ) {
|
||||
C4::Serials::ReopenSubscription( $subscriptionid );
|
||||
}
|
||||
my $op = $query->param('op') || q{};
|
||||
my $issueconfirmed = $query->param('issueconfirmed');
|
||||
my $subscriptionid = $query->param('subscriptionid');
|
||||
|
||||
# the subscription must be deletable if there is NO issues for a reason or another (should not happened, but...)
|
||||
|
||||
|
|
@ -68,7 +62,13 @@ $subs->{enddate} ||= GetExpirationDate($subscriptionid);
|
|||
my ($totalissues,@serialslist) = GetSerials($subscriptionid);
|
||||
$totalissues-- if $totalissues; # the -1 is to have 0 if this is a new subscription (only 1 issue)
|
||||
|
||||
if ($op eq 'del') {
|
||||
my $subscription = Koha::Subscriptions->find( $subscriptionid );
|
||||
|
||||
if ( $op and $op eq "close" ) {
|
||||
C4::Serials::CloseSubscription( $subscriptionid );
|
||||
} elsif ( $op and $op eq "reopen" ) {
|
||||
C4::Serials::ReopenSubscription( $subscriptionid );
|
||||
} elsif ($op eq 'del') {
|
||||
if ($$subs{'cannotedit'}){
|
||||
carp "Attempt to delete subscription $subscriptionid by ".C4::Context->userenv->{'id'}." not allowed";
|
||||
print $query->redirect("/cgi-bin/koha/serials/subscription-detail.pl?subscriptionid=$subscriptionid");
|
||||
|
|
@ -93,8 +93,7 @@ if ($op eq 'del') {
|
|||
print $query->redirect("/cgi-bin/koha/serials/serials-home.pl");
|
||||
exit;
|
||||
}
|
||||
}
|
||||
elsif ( $op and $op eq "share" ) {
|
||||
} elsif ( $op eq "share" ) {
|
||||
my $mana_language = $query->param('mana_language');
|
||||
my $result = Koha::SharedContent::send_entity($mana_language, $loggedinuser, $subscriptionid, 'subscription');
|
||||
$template->param( mana_code => $result->{msg} );
|
||||
|
|
|
|||
Loading…
Reference in New Issue