word edit: preserve wikipedia links in translation suggestions

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index 62d26d762d0f27f78f12fbd7981a56b797f75a2d..b5499173be7a37623b461c73e1667f0cbc723c26 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -28,9 +28,10 @@ form > ul > li > label {
 }
 form > ul > li > label + * {
        /* td */
-       width: 32em;
+       width: 40em;
 }
 
+.multiinput,
 input,select {
        box-sizing: border-box;
        flex-grow: 1;
@@ -48,6 +49,7 @@ select {
 #thumbpreview {
        width: 300px;
        align-self: start;
+       flex-shrink: 0;
 }
 
 ul.popup {
@@ -78,6 +80,13 @@ h1 {
 }
 .inline .inline {
        display: flex;
+       margin: 0;
+}
+.inline.multiinput {
+       flex-wrap: wrap;
+}
+.multiinput > input {
+       width: 10em;
 }
 
 #nav > ul,
@@ -106,6 +115,55 @@ my $db = eval {
 } or Abort('Database error', 501, $@);
 $db->abstract->{array_datatypes}++;
 
+my $user = eval {
+       if (defined $post{username}) {
+               $cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
+       }
+       elsif (exists $fields{logout}) {
+               require CGI::Cookie;
+               if (AddCookie(CGI::Cookie->new(
+                       -name    => 'login',
+                       -value   => '',
+                       -path    => '/writer',
+                       -expires => 'now',
+               )->as_string)) {
+                       delete $cookie{login};
+                       die "Logged out as requested\n";
+               }
+               Alert("Failed to log out", "Login cookie could not be removed.");
+       }
+
+       my $cookiedata = $cookie{login} or return;
+       my ($name, $key) = split /[:\v]/, DecodeURI($cookiedata);
+       my %rowmatch = (username => $name, pass => $key);
+       my $found = $db->select(login => '*', \%rowmatch)->hash
+               or die "Invalid user or password\n";
+
+       eval {
+               require CGI::Cookie;
+               my $httpcookie = CGI::Cookie->new(
+                       -name    => 'login',
+                       -value   => join(':', @{$found}{qw( username pass )}),
+                       -path    => '/writer',
+               ) or die "prepared object is empty\n";
+               AddCookie($httpcookie->as_string);
+       } or Abort(["Unable to create login cookie", $@], 403);
+
+       return $found;
+} or do {
+       say '<h1>Login to edit words</h1>';
+       Alert('Access denied', $@) if $@;
+       say '<form action="?" method="post" class="inline"><ul>';
+       my $loginform = bless {%post}, 'Shiar_Sheet::FormRow';
+       say '<li>', $loginform->input(@{$_}), '</li>' for pairs (
+               username => {-label => 'User name'},
+               pass     => {-label => 'Password', type => 'password'},
+       );
+       say '<li><input type="submit" value="Login" /></li>';
+       say '</ul></form>';
+       exit;
+};
+
 my %lang = (
        nl => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'nederlands'],
        en => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
@@ -144,13 +202,19 @@ if ($find) {
 if (exists $get{copy}) {
        $row = {%{$row}{ qw(prio lang cat) }};
 }
-elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
+elsif (defined $post{form}) {{
+       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') {
@@ -167,6 +231,8 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 
        eval {
                my %res = (returning => '*');
+               $row->{creator} = $user->{id} unless $find;
+               $row->{updated} = ['now()'];
                my $query = $find ? $db->update(word => $row, $find, \%res) :
                        $db->insert(word => $row, \%res);
                $row = $query->hash;
@@ -179,11 +245,14 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                while (my ($lang, $val) = each %post) {
                        my $field = $lang;
                        $lang =~ s/^trans-// or next;
-                       $db->insert(word => {
+                       $val = parseinput($val) or next;
+                       my %subrow = (
                                ref   => $row->{id},
                                lang  => $lang,
                                form  => $val,
-                       });
+                       );
+                       $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+                       $db->insert(word => \%subrow);
                        delete $fields{$field};
                }
                return 1;
@@ -253,6 +322,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 }}
 else {
        $row->{prio} //= 1;
+       $row->{lang} //= $user->{editlang}->[0];
        $row->{$_} = $get{$_} for keys %get;
 }
 
@@ -291,16 +361,19 @@ package Shiar_Sheet::FormRow {
                        );
                }
                else {
+                       my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple};
                        return (
                                (map {
                                        sprintf('<label for="%s">%s</label>', $col, $_)
                                } $attr->{-label} // ()),
+                               $multiple ? '<span class="inline multiinput">' : (),
                                (map {
                                        sprintf('<input name="%s" value="%s" />', $col, EscapeHTML($_))
                                } ref $val eq 'ARRAY' ? @{$val} : ()),
                                sprintf('<input id="%s" name="%1$s" value="%s"%s />',
-                                       $col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html
+                                       $col, $multiple ? '' : EscapeHTML($val), $html
                                ),
+                               $multiple ? '</span>' : (),
                                (map {
                                        sprintf '<img id="%spreview" src="/%s" alt="%s"%s />',
                                                $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
@@ -338,14 +411,18 @@ for my $col (@wordcols) {
        say '</p></li>';
 }
 
-if ($row->{id} and not $row->{ref}) {
+if (not $row->{ref}) {
        printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
                'trans', 'Translations';
-       my @children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
+       my @children = !$row->{id} ? () :
+               $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes;
        while (my ($lang, $val) = each %fields) {
                $lang =~ s/^trans-// or next;
                push @children, { lang => $lang, form => $val };
        }
+       my %existing = map { $_->{lang} => 1 } $row, @children;
+       $existing{$_} or push @children, { lang => $_ } for @{$user->{editlang}};
+
        for my $ref (@children) {
                printf(
                        '<li><label for="%s" title="%3$s">%s </label>',
@@ -354,7 +431,7 @@ if ($row->{id} and not $row->{ref}) {
                printf(
                        $ref->{id} ? '<a id="%s" href="%s">%s</a></li>' :
                        '<input id="%s" name="%1$s" value="%3$s" />',
-                       "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form}),
+                       "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form} // ''),
                );
        }
        say '</ul></div></li>';