X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/2f88d6b9e4bf65c539f2ea9a361f3c34f2011928..6fcc37bb969a9298ef5ad850d8b8361fe6ca3a5a:/writer.plp

diff --git a/writer.plp b/writer.plp
index 7280142..b549917 100644
--- 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,
@@ -104,6 +113,56 @@ my $db = eval {
 		pg_enable_utf8 => 1,
 	});
 } 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'],
@@ -127,10 +186,10 @@ my %wordcol = (
 	cover   => {-label => 'Highlighted', type => 'checkbox'},
 	grade   => {-label => 'Order', type => 'number'},
 	form    => {-label => 'Title'},
-	alt     => {-label => 'Synonyms'},
+	alt     => {-label => 'Synonyms', -multiple => 1},
 	wptitle => {-label => 'Wikipedia'},
 	source  => {-label => 'Image'},
-	thumb   => {-label => 'Convert options'},
+	thumb   => {-label => 'Convert options', -multiple => 1},
 );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
@@ -143,10 +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}};
-	$_ = 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') {
@@ -163,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;
@@ -175,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;
@@ -249,16 +322,18 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
 }}
 else {
 	$row->{prio} //= 1;
+	$row->{lang} //= $user->{editlang}->[0];
 	$row->{$_} = $get{$_} for keys %get;
 }
 
 my $title = $row->{id} ? "entry <small>#$row->{id}</small>" : 'new entry';
 
 package Shiar_Sheet::FormRow {
+	use PLP::Functions 'EscapeHTML';
+
 	sub input {
 		my ($row, $col, $attr) = @_;
 		my $val = $row->{$col} // '';
-		$val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
 		my $html = '';
 		$html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}};
 
@@ -286,13 +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, PLP::Functions::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' : '';
@@ -330,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>',
@@ -346,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>';