treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / lib / PublicInbox / WwwText.pm

diff --git a/lib/PublicInbox/WwwText.pm b/lib/PublicInbox/WwwText.pm
index 1c7b92bd466e5a1a5aeeeee97fc950a413a3184c..f6d831f62d1d2a7d1503ee00496fadb993631c58 100644 (file)
--- a/lib/PublicInbox/WwwText.pm
+++ b/lib/PublicInbox/WwwText.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # used for displaying help texts and other non-mail content
@@ -53,27 +53,25 @@ sub get_text {
        # Follow git commit message conventions,
        # first line is the Subject/title
        my ($title) = ($txt =~ /\A([^\n]*)/s);
-       _do_linkify($txt);
+       $ctx->{txt} = \$txt;
        $ctx->{-title_html} = ascii_html($title);
-
        my $nslash = ($key =~ tr!/!/!);
        $ctx->{-upfx} = '../../../' . ('../' x $nslash);
-
-       PublicInbox::WwwStream->response($ctx, $code, sub {
-               my ($nr, undef) = @_;
-               $nr == 1 ? '<pre>'.$txt.'</pre>' : undef
-       });
+       PublicInbox::WwwStream->response($ctx, $code, \&_do_linkify);
 }
 
 sub _do_linkify {
+       my ($nr, $ctx) = @_;
+       return unless $nr == 1;
        my $l = PublicInbox::Linkify->new;
-       $l->linkify_1($_[0]);
+       my $txt = delete $ctx->{txt};
+       $l->linkify_1($$txt);
        if ($hl) {
-               $hl->do_hl_text(\($_[0]));
+               $hl->do_hl_text($txt);
        } else {
-               $_[0] = ascii_html($_[0]);
+               $$txt = ascii_html($$txt);
        }
-       $_[0] = $l->linkify_2($_[0]);
+       '<pre>' . $l->linkify_2($$txt) . '</pre>';
 }
 
 sub _srch_prefix ($$) {
@@ -149,13 +147,15 @@ sub inbox_config ($$$) {
        ; note: public-inbox before v1.2.0 used "mainrepo"
        ; instead of "inboxdir", both remain supported after 1.2
        mainrepo = /path/to/top-level-inbox
+       url = https://example.com/$name/
+       url = http://example.onion/$name/
 EOS
-       for my $k (qw(address listid)) {
+       for my $k (qw(address listid infourl)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $_\n" for @$v;
        }
 
-       for my $k (qw(filter infourl newsgroup obfuscate replyto watchheader)) {
+       for my $k (qw(filter newsgroup obfuscate replyto watchheader)) {
                defined(my $v = $ibx->{$k}) or next;
                $$txt .= "\t$k = $v\n";
        }
@@ -168,17 +168,21 @@ EOS
 
                my $pi_config = $ctx->{www}->{pi_config};
                for my $cr_name (@$cr) {
-                       my $url = $pi_config->{"coderepo.$cr_name.cgiturl"};
+                       my $urls = $pi_config->{"coderepo.$cr_name.cgiturl"};
                        my $path = "/path/to/$cr_name";
                        $cr_name = dq_escape($cr_name);
 
                        $$txt .= qq([coderepo "$cr_name"]\n);
-                       if (defined($url)) {
-                               my $cpath = $path;
-                               if ($path !~ m![a-z0-9_/\.\-]!i) {
-                                       $cpath = dq_escape($cpath);
-                               }
-                               $$txt .= qq(\t; git clone $url "$cpath"\n);
+                       if ($urls && scalar(@$urls)) {
+                               $$txt .= "\t; ";
+                               $$txt .= join(" ||\n\t;\t", map {;
+                                       my $cpath = $path;
+                                       if ($path !~ m![a-z0-9_/\.\-]!i) {
+                                               $cpath = dq_escape($cpath);
+                                       }
+                                       qq(git clone $_ "$cpath");
+                               } @$urls);
+                               $$txt .= "\n";
                        }
                        $$txt .= "\tdir = $path\n";
                        $$txt .= "\tcgiturl = https://example.com/";