From d91598a4f20dc03e12905d7c15e63bfa16116529 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Sat, 13 Jun 2020 13:00:35 +0200
Subject: [PATCH] word edit: convert posted input to unicode

---
 tools/mkwordlist |  1 +
 writer.plp       | 20 +++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/mkwordlist b/tools/mkwordlist
index 5e965fe..b88cd1b 100755
--- a/tools/mkwordlist
+++ b/tools/mkwordlist
@@ -1,4 +1,5 @@
 #!/bin/sh
+echo 'use utf8;'
 psql sheet -XAt -c "
 	SELECT json_object_agg(coalesce(form, ''), forms) FROM _cat_words
 " | sed 's/ : / => /g'
diff --git a/writer.plp b/writer.plp
index cf19db4..d716754 100644
--- a/writer.plp
+++ b/writer.plp
@@ -153,12 +153,18 @@ if (exists $get{copy}) {
 	$row = {%{$row}{ qw(prio lang cat) }};
 }
 elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
+	sub parseinput {
+		return if not length $_[0];
+		require Encode;
+		return Encode::decode_utf8($_[0]);
+	}
+
 	my $replace = $row;
-	$row = {%post{keys %wordcol}};
-	$row->{$_} = [grep {length} @{ $post{"\@$_"} }] for grep {
-		ref $wordcol{$_} eq 'HASH' and $wordcol{$_}->{-multiple}
-	} keys %wordcol;
-	$_ = length ? $_ : undef for values %{$row};
+	$row = {map { $_ =>
+		ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ?
+			[ map { parseinput($_) } $post{'@'.$_}->@* ] :
+		scalar parseinput($post{$_})
+	} keys %wordcol};
 
 	if (!$row->{form}) {
 		if ($row->{ref} ne 'delete') {
@@ -190,8 +196,8 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 			$db->insert(word => {
 				ref   => $row->{id},
 				lang  => $lang,
-				form  => $val,
-			});
+				form  => $_,
+			}) for parseinput($val);
 			delete $fields{$field};
 		}
 		return 1;
-- 
2.30.0