X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=public-inbox.cgi;h=b9b484be38b5eb584892fcdb3e3670f4b38e7cb0;hb=48dc8ff5e67714985897047c189bdf019b796a60;hp=bd592ce3e3107c6ed77ea51f0cf0c761284393e4;hpb=b2da3f40fb7650a658b6ed1a15c81704d91b2831;p=public-inbox.git

diff --git a/public-inbox.cgi b/public-inbox.cgi
index bd592ce3..b9b484be 100755
--- a/public-inbox.cgi
+++ b/public-inbox.cgi
@@ -16,7 +16,6 @@ use CGI qw(:cgi :escapeHTML -nosticky); # PSGI/FastCGI/mod_perl compat
 use Encode qw(decode_utf8);
 use PublicInbox::Config;
 use URI::Escape qw(uri_escape uri_unescape);
-use Digest::SHA qw(sha1_hex);
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $pi_config;
 BEGIN {
@@ -65,12 +64,8 @@ sub main {
 	} elsif ($path_info =~ m!$LISTNAME_RE\z!o) {
 		invalid_list(\%ctx, $1) || redirect_list_index(\%ctx, $cgi);
 	} elsif ($path_info =~ m!$LISTNAME_RE(?:/|/index\.html)?\z!o) {
-		invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 1);
-	} elsif ($path_info =~ m!$LISTNAME_RE/(?:all\.html)?\z!o) {
 		invalid_list(\%ctx, $1) || get_index(\%ctx, $cgi, 0);
-	} elsif ($path_info =~ m!$LISTNAME_RE/index\.atom\.xml\z!o) {
-		invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 1);
-	} elsif ($path_info =~ m!$LISTNAME_RE/all\.atom\.xml\z!o) {
+	} elsif ($path_info =~ m!$LISTNAME_RE/atom\.xml\z!o) {
 		invalid_list(\%ctx, $1) || get_atom(\%ctx, $cgi, 0);
 
 	# single-message pages
@@ -78,14 +73,14 @@ sub main {
 		invalid_list_mid(\%ctx, $1, $2) || get_mid_txt(\%ctx, $cgi);
 	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\.html\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_mid_html(\%ctx, $cgi);
-	} elsif ($path_info =~ m!$LISTNAME_RE/m/(\S+)\z!o) {
-		redirect_mid_html($cgi, $1, $2);
 
 	# full-message page
 	} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\.html\z!o) {
 		invalid_list_mid(\%ctx, $1, $2) || get_full_html(\%ctx, $cgi);
-	} elsif ($path_info =~ m!$LISTNAME_RE/f/(\S+)\z!o) {
-		redirect_mid_html($cgi, $1, $2);
+
+	# convenience redirect
+	} elsif ($path_info =~ m!$LISTNAME_RE/(?:m|f)/(\S+)\z!o) {
+		invalid_list_mid(\%ctx, $1, $2) || redirect_mid(\%ctx, $cgi);
 
 	} else {
 		r404();
@@ -117,8 +112,7 @@ sub invalid_list_mid {
 	undef;
 }
 
-# /$LISTNAME/index.atom.xml                     -> Atom feed
-# /$LISTNAME/all.atom.xml                       -> Atom feed, includes replies
+# /$LISTNAME/atom.xml                       -> Atom feed, includes replies
 sub get_atom {
 	my ($ctx, $cgi, $top) = @_;
 	require PublicInbox::Feed;
@@ -133,7 +127,7 @@ sub get_atom {
 	];
 }
 
-# /$LISTNAME/?before=$GIT_COMMIT                 -> HTML only
+# /$LISTNAME/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
 	my ($ctx, $cgi, $top) = @_;
 	require PublicInbox::Feed;
@@ -152,7 +146,8 @@ sub get_index {
 sub mid2blob {
 	my ($ctx) = @_;
 	local $ENV{GIT_DIR} = $ctx->{git_dir};
-	my $hex = sha1_hex($ctx->{mid});
+	require Digest::SHA;
+	my $hex = Digest::SHA::sha1_hex($ctx->{mid});
 	$hex =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/i or
 			die "BUG: not a SHA-1 hex: $hex";
 	my $blob = `git cat-file blob HEAD:$1/$2 2>/dev/null`;
@@ -172,8 +167,9 @@ sub get_mid_html {
 	my $x = mid2blob($ctx);
 	return r404() unless $x;
 
-	my $pfx = "../f/" . uri_escape($ctx->{mid}) . ".html";
 	require PublicInbox::View;
+	my $mid_href = PublicInbox::View::ascii_html(uri_escape($ctx->{mid}));
+	my $pfx = "../f/$mid_href.html";
 	require Email::MIME;
 	[ "200 OK", {'Content-Type' => 'text/html'},
 		PublicInbox::View->as_html(Email::MIME->new($$x), $pfx)];
@@ -195,6 +191,13 @@ sub redirect_list_index {
 	do_redirect($cgi->self_url . "/");
 }
 
+sub redirect_mid {
+	my ($ctx, $cgi) = @_;
+	my $url = $cgi->self_url;
+	$url =~ s!/f/!/m/!;
+	do_redirect($url . '.html');
+}
+
 sub do_redirect {
 	my ($url) = @_;
 	[ '301 Moved Permanently',