X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/4f5cf4e5cdd485de426573c797ae54a7828999fd..6fcc37bb969a9298ef5ad850d8b8361fe6ca3a5a:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index cf19db4..b549917 100644
--- a/writer.plp
+++ b/writer.plp
@@ -31,6 +31,7 @@ form > ul > li > label + * {
width: 40em;
}
+.multiinput,
input,select {
box-sizing: border-box;
flex-grow: 1;
@@ -114,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 '
Login to edit words
';
+ Alert('Access denied', $@) if $@;
+ say '';
+ 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'],
@@ -152,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') {
@@ -175,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;
@@ -187,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;
@@ -261,6 +322,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
}}
else {
$row->{prio} //= 1;
+ $row->{lang} //= $user->{editlang}->[0];
$row->{$_} = $get{$_} for keys %get;
}
@@ -299,18 +361,19 @@ package Shiar_Sheet::FormRow {
);
}
else {
+ my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple};
return (
(map {
sprintf('', $col, $_)
} $attr->{-label} // ()),
- ref $val ne 'ARRAY' ? () : '',
+ $multiple ? '' : (),
(map {
sprintf('', $col, EscapeHTML($_))
} ref $val eq 'ARRAY' ? @{$val} : ()),
sprintf('',
- $col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html
+ $col, $multiple ? '' : EscapeHTML($val), $html
),
- ref $val ne 'ARRAY' ? () : '',
+ $multiple ? '' : (),
(map {
sprintf '',
$col, $_, $row->{form}, $col eq 'source' ? ' hidden' : '';
@@ -348,14 +411,18 @@ for my $col (@wordcols) {
say '';
}
-if ($row->{id} and not $row->{ref}) {
+if (not $row->{ref}) {
printf '',
'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(
'- ',
@@ -364,7 +431,7 @@ if ($row->{id} and not $row->{ref}) {
printf(
$ref->{id} ? '%s
' :
'',
- "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form}),
+ "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form} // ''),
);
}
say '
';