X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/8a0d8b82a160fd9803cab50d25ba1f587b0066d2..6fcc37bb969a9298ef5ad850d8b8361fe6ca3a5a:/writer.plp diff --git a/writer.plp b/writer.plp index fd2fc86..b549917 100644 --- a/writer.plp +++ b/writer.plp @@ -116,11 +116,53 @@ my $db = eval { $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); - $db->select(login => '*', \%rowmatch)->hash; -} or Abort('Login required', 403); + 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'], @@ -160,7 +202,7 @@ 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; @@ -189,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; @@ -201,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 => $_, - }) for parseinput($val); + form => $val, + ); + $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand + $db->insert(word => \%subrow); delete $fields{$field}; } return 1; @@ -275,6 +322,7 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ }} else { $row->{prio} //= 1; + $row->{lang} //= $user->{editlang}->[0]; $row->{$_} = $get{$_} for keys %get; } @@ -363,14 +411,18 @@ for my $col (@wordcols) { say '

'; } -if ($row->{id} and not $row->{ref}) { +if (not $row->{ref}) { printf '
  • ';