projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 12062: Follow up to fix more untraslatable cases
[koha_fer]
/
opac
/
opac-sendbasket.pl
diff --git
a/opac/opac-sendbasket.pl
b/opac/opac-sendbasket.pl
index
da74745
..
5821bea
100755
(executable)
--- a/
opac/opac-sendbasket.pl
+++ b/
opac/opac-sendbasket.pl
@@
-127,25
+127,34
@@
if ( $email_add ) {
my $body;
# Analysing information and getting mail properties
my $body;
# Analysing information and getting mail properties
- if ( $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s ) {
- $mail{'subject'} = $1;
+
+ if ( $template_res =~ /<SUBJECT>(.*)<END_SUBJECT>/s ) {
+ $mail{subject} = $1;
+ $mail{subject} =~ s|\n?(.*)\n?|$1|;
}
else { $mail{'subject'} = "no subject"; }
my $email_header = "";
}
else { $mail{'subject'} = "no subject"; }
my $email_header = "";
- if ( $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s ) {
- $email_header = encode_qp($1);
+ if ( $template_res =~ /<HEADER>(.*)<END_HEADER>/s ) {
+ $email_header = $1;
+ $email_header =~ s|\n?(.*)\n?|$1|;
+ $email_header = encode_qp($email_header);
}
my $email_file = "basket.txt";
}
my $email_file = "basket.txt";
- if ( $template_res =~ /<FILENAME>
\n(.*)\n?
<END_FILENAME>/s ) {
+ if ( $template_res =~ /<FILENAME>
(.*)
<END_FILENAME>/s ) {
$email_file = $1;
$email_file = $1;
+ $email_file =~ s|\n?(.*)\n?|$1|;
}
}
- if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) {
- $body = encode_qp($1);
+ if ( $template_res =~ /<MESSAGE>(.*)<END_MESSAGE>/s ) {
+ $body = $1;
+ $body =~ s|\n?(.*)\n?|$1|;
+ $body = encode_qp($body);
}
}
+ $mail{body} = $body;
+
my $boundary = "====" . time() . "====";
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
my $boundary = "====" . time() . "====";
$mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";