version => '1.0',
nocache => 1,
raw => <<'EOT',
-<style>
-dl {
- display: inline-grid;
- grid: auto-flow / min-content repeat(10, auto);
-}
-
-form > ul {
- display: table;
- border-spacing: 0 2px;
-}
-form > ul > li {
- display: table-row;
-}
-form > ul > li > * {
- display: table-cell;
- padding-right: .5em;
-}
-form > ul > li > label {
- /* th */
- text-align: right;
-}
-form > ul > li > label + * {
- /* td */
- width: 32em;
-}
-
-input,select {
- box-sizing: border-box;
- flex-grow: 1;
-}
-input:not([type=submit]) {
- padding: .4rem;
- font-family: monospace;
-}
-input[type=number] {
- max-width: 7em;
-}
-select {
- padding: .3rem .2rem; /* TODO: input */
-}
-#thumbpreview {
- width: 300px;
- align-self: start;
-}
-
-ul.popup {
- display: flex;
- flex-wrap: wrap;
- align-items: end;
- position: fixed;
- left: 0;
- top: 0;
- margin: auto;
- max-height: 90%;
- max-width: 90%;
- overflow: auto;
- background: rgba(0, 0, 0, .8);
- border: 1px solid #CCC;
-}
-
-h1 {
- margin-bottom: 1ex;
-}
-.inline {
- display: inline-flex;
- align-items: baseline;
- margin: 0 -1ex; /* inner gap */
-}
-.inline > * {
- margin: 0 1ex;
-}
-.inline .inline {
- display: flex;
-}
-
-#nav > ul,
-#nav > ul strong,
-#nav form {
- margin: 1ex 0;
- display: inline-block;
-}
-</style>
-
+<link rel="stylesheet" type="text/css" media="all" href="/editor.css" />
<script src="/writer.js"></script>
EOT
});
use List::Util qw( pairs pairkeys );
my $db = eval {
- my @dbinfo = (
- 'DBI:Pg:dbname=sheet;host=localhost', 'sheetadmin', 'fairuse',
- ) or die "database not configured\n";
- require DBIx::Simple;
- DBIx::Simple->new(@dbinfo[0..2], {
- RaiseError => 1,
- pg_enable_utf8 => 1,
- });
+ require Shiar_Sheet::DB;
+ Shiar_Sheet::DB->connect;
} 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'],
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'},
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') {
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;
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,
- });
+ prio => undef,
+ );
+ $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand
+ $db->insert(word => \%subrow);
delete $fields{$field};
}
return 1;
}
@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;
}
}}
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';
$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),
);
}
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' : '';
sub imagepath {
my ($row, $col) = @_;
return "data/word/org/$row->{id}.jpg" if $col eq 'source';
- return "data/word/en/$row->{form}.jpg" if $col eq 'thumb';
+ return "data/word/en/$row->{id}.jpg" if $col eq 'thumb';
return;
}
}
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>',
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>';
git.shiar.nl / sheet.git / blobdiff