Martin Renvoize
ebf8e267ac
This patch adds conditional formatting based on whether the notice was
generated from an HTML template or a plaintext one. We simply drop the
'html_line_break' filter for the case where the notice should already be
html formatted.
I was tempted to replace the html_line_break for plaintext formatted
notices too as I believe this closer resembles how we actually output
such generated notices.. but I decided that should be for another bug.
Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit f83b9ab1ff)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
122 lines
4.1 KiB
Perl
Executable file
122 lines
4.1 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Displays sent notices for a given borrower
|
|
|
|
# Copyright (c) 2009 BibLibre
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
use C4::Auth qw( get_template_and_user );
|
|
use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers );
|
|
use CGI qw ( -utf8 );
|
|
use C4::Members;
|
|
use C4::Letters qw( GetPreparedLetter EnqueueLetter );
|
|
use Koha::Patrons;
|
|
use Koha::Patron::Categories;
|
|
use Koha::Patron::Password::Recovery qw( SendPasswordRecoveryEmail ValidateBorrowernumber );
|
|
|
|
my $input=CGI->new;
|
|
|
|
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
my $patron = Koha::Patrons->find( $borrowernumber );
|
|
unless ( $patron ) {
|
|
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?borrowernumber=$borrowernumber");
|
|
exit;
|
|
}
|
|
my $borrower = $patron->unblessed;
|
|
|
|
my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/notices.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
flagsrequired => {borrowers => 'edit_borrowers'},
|
|
});
|
|
|
|
my $logged_in_user = Koha::Patrons->find( $loggedinuser );
|
|
output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
|
|
|
|
# Allow resending of messages in Notices tab
|
|
my $op = $input->param('op') || q{};
|
|
if ( $op eq 'resend_notice' ) {
|
|
my $message_id = $input->param('message_id');
|
|
my $message = C4::Letters::GetMessage( $message_id );
|
|
if ( $message->{borrowernumber} = $borrowernumber ) {
|
|
C4::Letters::ResendMessage( $message_id );
|
|
# redirect to self to avoid form submission on refresh
|
|
print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
}
|
|
|
|
if ( $op eq 'send_welcome' ) {
|
|
my $emailaddr = $patron->notice_email_address;
|
|
|
|
# if we manage to find a valid email address, send notice
|
|
if ($emailaddr) {
|
|
eval {
|
|
my $letter = GetPreparedLetter(
|
|
module => 'members',
|
|
letter_code => 'WELCOME',
|
|
branchcode => $patron->branchcode,,
|
|
lang => $patron->lang || 'default',
|
|
tables => {
|
|
'branches' => $patron->branchcode,
|
|
'borrowers' => $patron->borrowernumber,
|
|
},
|
|
want_librarian => 1,
|
|
) or return;
|
|
|
|
my $message_id = EnqueueLetter(
|
|
{
|
|
letter => $letter,
|
|
borrowernumber => $patron->id,
|
|
to_address => $emailaddr,
|
|
message_transport_type => 'email'
|
|
}
|
|
);
|
|
};
|
|
}
|
|
|
|
# redirect to self to avoid form submission on refresh
|
|
print $input->redirect("/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
|
|
if ( $op eq 'send_password_reset' ) {
|
|
|
|
my $emailaddr = $patron->notice_email_address;
|
|
|
|
if ($emailaddr) {
|
|
|
|
# send staff initiated password recovery
|
|
SendPasswordRecoveryEmail( $patron, $emailaddr, 1 );
|
|
}
|
|
|
|
# redirect to self to avoid form submission on refresh
|
|
print $input->redirect(
|
|
"/cgi-bin/koha/members/notices.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
|
|
# Getting the messages
|
|
my $queued_messages = Koha::Notice::Messages->search({borrowernumber => $borrowernumber});
|
|
|
|
$template->param(
|
|
patron => $patron,
|
|
QUEUED_MESSAGES => $queued_messages,
|
|
borrowernumber => $borrowernumber,
|
|
sentnotices => 1,
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|