word edit: null priority to inherit from parent

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index ce52761ef490526c6d510f2b931441d8652e24a7..a97bbfae4ec4d60e74c6a32750d311f57e72e9e8 100644 (file)
--- 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 '<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'],
@@ -136,9 +178,14 @@ my %wordcol = (
        cat     => [{-label => 'Category'}, 'ref'],
        ref     => {-label => 'Reference'},
        prio    => [
-               {-label => 'Level', -select => [qw(
-                       essential basic common distinctive rare invisible
-               )]},
+               {-label => 'Level', -select => sub {
+                       my ($row) = @_;
+                       my @enum = qw[ essential basic common distinctive optional invisible ];
+                       return {
+                               ('' => 'parent') x (defined $row->{ref}),
+                               map { $_ => $enum[$_] } 0 .. $#enum
+                       };
+               }},
                'cover', 'grade',
        ],
        cover   => {-label => 'Highlighted', type => 'checkbox'},
@@ -160,7 +207,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;
@@ -203,11 +250,15 @@ 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,
+                               prio  => undef,
+                       );
+                       $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+                       $db->insert(word => \%subrow);
                        delete $fields{$field};
                }
                return 1;
@@ -252,12 +303,13 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                        }
                        @cmds = (
                                'convert',
+                               $imgpath,
                                -delete => '1--1', -background => 'white',
                                -gravity => @cmds ? 'northwest' : 'center',
                                @cmds,
                                -resize => "$xyres^", -extent => $xyres,
                                '-strip', -quality => '60%', -interlace => 'plane',
-                               $imgpath => $thumbpath
+                               $thumbpath
                        );
                        eval {
                                require IPC::Run;
@@ -276,9 +328,9 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
        }
 }}
 else {
-       $row->{prio} //= 1;
        $row->{lang} //= $user->{editlang}->[0];
        $row->{$_} = $get{$_} for keys %get;
+       $row->{prio} = defined $row->{ref} ? undef : 1 unless exists $row->{prio};
 }
 
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
@@ -293,8 +345,7 @@ package Shiar_Sheet::FormRow {
                $html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
 
                if (my $options = $attr->{-select}) {
-                       $options = { map {$_ => $options->[$_]} 0 .. $#{$options} }
-                               if ref $options eq 'ARRAY';
+                       $options = $options->(@_) if ref $options eq 'CODE';
                        $options->{$val} //= "unknown ($val)";  # preserve current
                        return (
                                sprintf('<select id="%s" name="%1$s">', $col),