Bug 17720: CSRF - Handle unicode characters

[srvgit] / members / moremember.pl

diff --git a/members/moremember.pl b/members/moremember.pl
index 01d16b6..70aed84 100755 (executable)
--- a/members/moremember.pl
+++ b/members/moremember.pl
@@ -37,6 +37,7 @@ use strict;
 #use warnings; FIXME - Bug 2505
 use CGI qw ( -utf8 );
 use Digest::MD5 qw(md5_base64);
+use Encode qw( encode );
 use C4::Context;
 use C4::Auth;
 use C4::Output;
@@ -275,7 +276,7 @@ $template->param( picture => 1 ) if $patron_image;
 $template->param(
     csrf_token => Koha::Token->new->generate_csrf({
         id     => C4::Context->userenv->{id},
-        secret => md5_base64( C4::Context->config('pass') ),
+        secret => md5_base64( Encode::encode( 'UTF-8', C4::Context->config('pass') ) ),
     }),
 );
 
@@ -318,7 +319,7 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) {
     C4::Form::MessagingPreferences::set_form_values({ borrowernumber => $borrowernumber }, $template);
     $template->param(messaging_form_inactive => 1);
     $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver"));
-    $template->param(SMSnumber     => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'});
+    $template->param(SMSnumber     => $data->{'smsalertnumber'});
     $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification"));
 }