diff options
| author | Eric Wong <e@yhbt.net> | 2020-01-25 04:44:56 +0000 |
|---|---|---|
| committer | Eric Wong <e@yhbt.net> | 2020-01-27 02:59:09 +0000 |
| commit | c3d8c3df9f91aead9f6c24e1402b24e02c6a6def (patch) | |
| tree | ead849904b0906476d4a6c7837a75bdbcd8571ad /lib/PublicInbox/WwwStream.pm | |
| parent | a56c80e063f992075a39d49dec4cafc0479c850e (diff) | |
| download | public-inbox-c3d8c3df9f91aead9f6c24e1402b24e02c6a6def.tar.gz | |
This should make it clear that we only use these elements once and can discard them. While we're in the area, avoid escaping '"' by using qq() instead of "" to quote strings requiring interpolation.
Diffstat (limited to 'lib/PublicInbox/WwwStream.pm')
| -rw-r--r-- | lib/PublicInbox/WwwStream.pm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index ef5897b2..a4ba1fff 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -40,25 +40,20 @@ sub _html_top ($) { my $ctx = $self->{ctx}; my $ibx = $ctx->{-inbox}; my $desc = ascii_html($ibx->description); - my $title = $ctx->{-title_html} || $desc; + my $title = delete($ctx->{-title_html}) // $desc; my $upfx = $ctx->{-upfx} || ''; my $help = $upfx.'_/text/help'; my $color = $upfx.'_/text/color'; my $atom = $ctx->{-atom} || $upfx.'new.atom'; - my $tip = $ctx->{-html_tip} || ''; my $top = "<b>$desc</b>"; my $links = "<a\nhref=\"$help\">help</a> / ". "<a\nhref=\"$color\">color</a> / ". "<a\nhref=\"$atom\">Atom feed</a>"; if ($ibx->search) { - my $q_val = $ctx->{-q_value_html}; - if (defined $q_val && $q_val ne '') { - $q_val = qq(\nvalue="$q_val"); - } else { - $q_val = ''; - } + my $q_val = delete($ctx->{-q_value_html}) // ''; + $q_val = qq(\nvalue="$q_val") if $q_val ne ''; # XXX gross, for SearchView.pm - my $extra = $ctx->{-extra_form_html} || ''; + my $extra = delete($ctx->{-extra_form_html}) // ''; my $action = $upfx eq '' ? './' : $upfx; $top = qq{<form\naction="$action"><pre>$top} . qq{\n<input\nname=q\ntype=text$q_val />} . @@ -70,10 +65,10 @@ sub _html_top ($) { $top = '<pre>' . $top . "\n" . $links . '</pre>'; } "<html><head><title>$title</title>" . - "<link\nrel=alternate\ntitle=\"Atom feed\"\n". - "href=\"$atom\"\ntype=\"application/atom+xml\"/>" . + qq(<link\nrel=alternate\ntitle="Atom feed"\n). + qq(href="$atom"\ntype="application/atom+xml"/>) . $ctx->{www}->style($upfx) . - "</head><body>". $top . $tip; + '</head><body>'. $top . (delete($ctx->{-html_tip}) // ''); } sub code_footer ($) { |