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

Bug 17109: Remove second authentication from (opac-)sendbasket 

Patch deals with opac and intranet variant.
If we authenticated the first time, it is not necessary to do it
a second time rightaway.

Replaces a call to get_template_and_user (including checkauth) by
gettemplate.

Also removes duplicate use C4::Biblio statements.

Test plan:
[1] Put a few books in the cart.
[2] Send the cart from OPAC.
[3] Send the cart from intranet.

Tested 3 patches together. Works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2016-08-11 13:10:21 +02:00 committed by Kyle M Hall
parent a9d3eb233b
commit 36b9fa32b1
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
basket/sendbasket.pl
View File

@ -15,8 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
use Modern::Perl;
use CGI qw ( -utf8 );
use Encode qw(encode);
@ -29,7 +28,7 @@ use C4::Biblio;
use C4::Items;
use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Templates ();
use Koha::Email;
my $query = new CGI;
@ -53,15 +52,13 @@ if ( $email_add ) {
my $email = Koha::Email->new();
my %mail = $email->create_message_headers({ to => $email_add });
my $comment = $query->param('comment');
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "basket/sendbasket.tt",
query => $query,
type => "intranet",
authnotrequired => 0,
flagsrequired => { catalogue => 1 },
}
# Since we are already logged in, no need to check credentials again
# We only need to add OPACBaseURL
my $template2 = C4::Templates::gettemplate(
'basket/sendbasket.tt', 'intranet', $query,
);
$template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
my @bibs = split( /\//, $bib_list );
my @results;

17
opac/opac-sendbasket.pl
View File

@ -17,8 +17,7 @@
# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
use Modern::Perl;
use CGI qw ( -utf8 );
use Encode qw(encode);
@ -31,8 +30,8 @@ use C4::Biblio;
use C4::Items;
use C4::Auth;
use C4::Output;
use C4::Biblio;
use C4::Members;
use C4::Templates ();
use Koha::Email;
my $query = new CGI;
@ -67,14 +66,12 @@ if ( $email_add ) {
});
$mail{'X-Abuse-Report'} = C4::Context->preference('KohaAdminEmailAddress');
my ( $template2, $borrowernumber, $cookie ) = get_template_and_user(
{
template_name => "opac-sendbasket.tt",
query => $query,
type => "opac",
authnotrequired => 0,
}
# Since we are already logged in, no need to check credentials again
# We only need to add OPACBaseURL
my $template2 = C4::Templates::gettemplate(
'opac-sendbasket.tt', 'opac', $query,
);
$template2->param( OPACBaseURL => C4::Context->preference('OPACBaseURL') );
my @bibs = split( /\//, $bib_list );
my @results;