MirrorMirror
/
lufi
mirror of https://framagit.org/fiat-tux/hat-softwares/lufi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

🔀 Merge branch 'development'

This commit is contained in:
Luc Didry 2020-11-25 16:04:48 +01:00
parent 154ecd6ebf 379df04588
commit 900ebd6569
No known key found for this signature in database
GPG Key ID: EA868E12D0257E3C
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG
View File

@ -1,6 +1,7 @@
Revision history for Lufi Revision history for Lufi
?.??.? ????-??-?? ?.??.? ????-??-??
- 🐛 Invitation, error 500 when guest send file with special character (#229)
0.05.8 2020-11-18 0.05.8 2020-11-18
- 🌐 Update translations - 🌐 Update translations

9
lib/Lufi/Controller/Invitation.pm
View File

@ -5,6 +5,7 @@ use Mojo::Collection 'c';
use Mojo::File; use Mojo::File;
use Mojo::JSON qw(true false decode_json encode_json); use Mojo::JSON qw(true false decode_json encode_json);
use Mojo::URL; use Mojo::URL;
use Mojo::Util qw(decode encode);
use Email::Valid; use Email::Valid;
use Lufi::DB::File; use Lufi::DB::File;
use Lufi::DB::Invitation; use Lufi::DB::Invitation;
@ -230,7 +231,7 @@ sub send_mail_to_ldap_user {
my $guest_files = $invitation->files; my $guest_files = $invitation->files;
my %list_token; my %list_token;
if ($guest_files) { if ($guest_files) {
$guest_files = decode_json($guest_files); $guest_files = decode_json(encode 'UTF-8', $guest_files);
for my $file (@{$guest_files}) { for my $file (@{$guest_files}) {
$list_token{$file->{token}} = 1; $list_token{$file->{token}} = 1;
} }
@ -240,17 +241,17 @@ sub send_mail_to_ldap_user {
push @files, @{$guest_files}; push @files, @{$guest_files};
$urls->each(sub { $urls->each(sub {
my ($e, $num) = @_; my ($e, $num) = @_;
$e = decode_json($e); $e = decode_json(encode 'UTF-8', $e);
if (!defined($list_token{$e->{token}})) { if (!defined($list_token{$e->{token}})) {
push @{$guest_files}, $e; push @{$guest_files}, $e;
push @files, $e; push @files, $e;
} }
}); });
$invitation->files(encode_json($guest_files)); $invitation->files(decode 'UTF-8', encode_json($guest_files));
$invitation->write; $invitation->write;
} else { } else {
$urls->each(sub { $urls->each(sub {
push @files, decode_json(shift); push @files, decode_json(encode 'UTF-8', shift);
}); });
} }
my $already_notified = 1; my $already_notified = 1;

4
themes/default/lib/Lufi/I18N/el.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" "POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
"PO-Revision-Date: 2020-11-15 06:52+0000\n" "PO-Revision-Date: 2020-11-21 12:52+0000\n"
"Last-Translator: Dimitris T. <dimitris@stinpriza.org>\n" "Last-Translator: Dimitris T. <dimitris@stinpriza.org>\n"
"Language-Team: Greek <https://weblate.framasoft.org/projects/lufi/" "Language-Team: Greek <https://weblate.framasoft.org/projects/lufi/"
"default-theme/el/>\n" "default-theme/el/>\n"
@ -67,7 +67,7 @@ msgstr ":"
#: themes/default/templates/render.html.ep:42 #: themes/default/templates/render.html.ep:42
msgid "Abort" msgid "Abort"
msgstr "" msgstr "Ακύρωση"
#: themes/default/templates/layouts/default.html.ep:53 themes/default/templates/layouts/default.html.ep:86 #: themes/default/templates/layouts/default.html.ep:53 themes/default/templates/layouts/default.html.ep:86
msgid "About" msgid "About"