@@ -, +, @@ - Fix sql syntax error - Fix Encoding - SendAlerts must return an error if no email is defined - Get error if no email in memberentry --- C4/Letters.pm | 19 ++++++++++--------- .../prog/en/modules/members/memberentrygen.tt | 11 +++++++++++ members/memberentry.pl | 14 ++++++++++++-- 3 files changed, 33 insertions(+), 11 deletions(-) --- a/C4/Letters.pm +++ a/C4/Letters.pm @@ -295,8 +295,8 @@ sub SendAlerts { my %mail = ( To => $email, From => $email, - Subject => "" . $letter->{title}, - Message => "" . $letter->{content}, + Subject => Encode::encode( "utf8", "" . $letter->{title} ), + Message => Encode::encode( "utf8", "" . $letter->{content} ), 'Content-Type' => 'text/plain; charset="utf8"', ); sendmail(%mail) or carp $Mail::Sendmail::error; @@ -323,8 +323,8 @@ sub SendAlerts { LEFT JOIN biblio ON serial.biblionumber=biblio.biblionumber LEFT JOIN aqbooksellers ON subscription.aqbooksellerid=aqbooksellers.id WHERE serial.serialid IN ( - } - . join( ",", @$externalid ) . ")"; + }; + $strsth .= join( ",", @$externalid ) . ")"; my $sthorders = $dbh->prepare($strsth); $sthorders->execute; my $dataorders = $sthorders->fetchall_arrayref( {} ); @@ -339,7 +339,7 @@ sub SendAlerts { push @email, $databookseller->{contemail} if $databookseller->{contemail}; unless (@email) { warn "Bookseller $dataorders->[0]->{booksellerid} without emails"; - return; + return { error => "no_email" }; } my $userenv = C4::Context->userenv; @@ -359,8 +359,8 @@ sub SendAlerts { my %mail = ( To => join( ','. @email), From => $userenv->{emailaddress}, - Subject => "" . $letter->{title}, - Message => "" . $letter->{content}, + Subject => Encode::encode( "utf8", "" . $letter->{title} ), + Message => Encode::encode( "utf8", "" . $letter->{content} ), 'Content-Type' => 'text/plain; charset="utf8"', ); sendmail(%mail) or carp $Mail::Sendmail::error; @@ -392,11 +392,12 @@ sub SendAlerts { want_librarian => 1, ) or return; + return { error => "no_email" } unless $externalid->{'emailaddr'}; my %mail = ( To => $externalid->{'emailaddr'}, From => $branchdetails->{'branchemail'} || C4::Context->preference("KohaAdminEmailAddress"), - Subject => $letter->{'title'}, - Message => $letter->{'content'}, + Subject => Encode::encode( "utf8", $letter->{'title'} ), + Message => Encode::encode( "utf8", $letter->{'content'} ), 'Content-Type' => 'text/plain; charset="utf8"', ); sendmail(%mail) or carp $Mail::Sendmail::error; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -82,6 +82,17 @@
There are no libraries defined. [% IF ( CAN_user_parameters ) %]Please add a library.[% ELSE %]An administrator must define at least one library.[% END %]
[% END %] [% IF ( no_categories ) %]There are no patron categories defined. [% IF ( CAN_user_parameters ) %]Please add a patron category.[% ELSE %]An administrator must define at least one patron category.
[% END %][% END %]