From c494e2f97461b5b524607cef88657e0bb89add25 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 31 Dec 2006 20:50:22 +0000 Subject: * Escape shashes in page titles entered in the blog post form. * Munge openids of the form somehost.com/user (trial, may revert) --- IkiWiki/CGI.pm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'IkiWiki') diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index 7f84f345a..83ed959c0 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -634,6 +634,7 @@ sub cgi (;$$) { #{{{ } elsif ($do eq 'blog') { my $page=titlepage(decode_utf8($q->param('title'))); + $page=~s/(\/)/"__".ord($1)."__"/eg; # escape slashes too # if the page already exists, munge it to be unique my $from=$q->param('from'); my $add=""; @@ -665,6 +666,10 @@ sub userlink ($) { #{{{ if ($display !~ /\[/) { $display=~s/^(.*?)\.([^.]+\.[a-z]+)$/$1 [$2]/; } + # Convert "somehost.com/user" to "user [somehost.com]". + if ($display !~ /\[/) { + $display=~s/^(.+)\/[^\/](.+)$/$2 [$1]/; + } $display=~s!^https?://!!; # make sure this is removed return "".escapeHTML($display).""; } -- cgit v1.2.3