X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/3d1587c2e784bae0642f9d788d82936282ca61ea..327c4c234570dabd716f92da15cf0ef716b9cb5d:/browser.plp

diff --git a/browser.plp b/browser.plp
index d623a34..c10c20f 100644
--- a/browser.plp
+++ b/browser.plp
@@ -135,7 +135,7 @@ print "</thead>\n";
 
 sub featurescore {
 	# relative amount of support for given feature
-	state $statspts = { y=>10, 'y x'=>10, a=>5, 'a x'=>5, j=>2, 'p j'=>2, p=>1 };
+	state $statspts = { y=>10, 'y x'=>10, a=>5, 'a x'=>5, j=>2, 'p j'=>2, 'p p'=>2, p=>1 };
 	my $rank = 0;
 	if (my $row = shift) {
 		if ($canihas) {
@@ -181,15 +181,15 @@ sub saytitlecol {
 			sprintf("try { %s; return false } catch(err) { return true }",
 				"document.getElementById('$id').classList.toggle('target')",
 			),
-			$_,
+			Entity($_),
 		);
 	} $row->{title};
 	print '<div class=aside>';
 	s/\.?$/./, print "<p>$_</p>" for map { ref $_ ? @$_ : $_ || () }
-		$row->{description}, $row->{notes};
-	printf 'Resources: %s.', join(', ',
-		map { qq(<a href="$_->{url}">$_->{title}</a>) } @$_
-	) for grep { @$_ } $row->{links} // ();
+		Entity($row->{description}), formathtml($row->{notes});  # sic
+	printf 'Resources: %s.', join(', ', map {
+		sprintf '<a href="%s">%s</a>', EscapeHTML($_->{url}), $_->{title}
+	} @$_) for grep { @$_ } $row->{links} // ();
 	print '</div>';
 }
 
@@ -257,6 +257,16 @@ for my $id (sort {
 print '<tfoot>', $header;
 print '</table>';
 
+sub formathtml {
+	my $ref = defined wantarray ? [@_] : \@_;
+	for (@$ref) {
+		s/& (?!\w)/&amp;/gx;
+		s/< \s/&lt;/gx;
+		s/\n\K\n/<br>/g;
+	}
+	return @$ref;
+}
+
 sub paddedver {
 	# normalised version number comparable as string (cmp)
 	shift =~ /^(\d*)(.*)/;
@@ -313,6 +323,6 @@ sub showversions {
 	</div>
 </div>
 
-<script src="/searchlocal.js"></script>
-<script> prependsearch(document.getElementById('intro')) </script>
+<script type="text/javascript" src="/searchlocal.js"></script>
+<script type="text/javascript"> prependsearch(document.getElementById('intro')) </script>