X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fblosxom.git;a=blobdiff_plain;f=blosxom.cgi;h=3d7727a9c3448bf45be0cc24387d71c39ce06f07;hp=ee9bebc03717f46c203afef2366d0926221fe88f;hb=843e99101526c5103eb6938c4449a34339cb1793;hpb=56351d2ec62f92e42f8f20024c2fd94d940f1f59 diff --git a/blosxom.cgi b/blosxom.cgi index ee9bebc..3d7727a 100755 --- a/blosxom.cgi +++ b/blosxom.cgi @@ -2,7 +2,7 @@ # Blosxom # Author: Rael Dornfest -# Version: 2.0.2 +# Version: 2.1.0 # Home/Docs/Licensing: http://blosxom.sourceforge.net/ # Development/Downloads: http://sourceforge.net/projects/blosxom @@ -88,7 +88,7 @@ use File::stat; use Time::Local; use CGI qw/:standard :netscape/; -$version = "2.0.2"; +$version = "2.1.0"; # Should I encode entities for xml content-types? (plugins can turn this off if they do it themselves) $encode_xml_entities = 1; @@ -144,6 +144,8 @@ my $fh = new FileHandle; # Use the stated preferred URL or figure it out automatically $url ||= url( -path_info => 1 ); +# Unescape %XX hex codes (from URI::Escape::uri_unescape) +$url =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg; $url =~ s/^included:/http:/ if $ENV{SERVER_PROTOCOL} eq 'INCLUDED'; # NOTE: Since v3.12, it looks as if CGI.pm misbehaves for SSIs and @@ -733,34 +735,31 @@ sub nice_date { __DATA__ html content_type text/html; charset=$blog_encoding +html head html head html head -html head -html head -html head $blog_title $path_info_da $path_info_mo $path_info_yr -html head +html head +html head +html head $blog_title $path_info_da $path_info_mo $path_info_yr html head html head -html head -html head $blog_title
-html head $path_info_da $path_info_mo $path_info_yr -html head -html head

+html head

$blog_title

+html head

$path_info_da $path_info_mo $path_info_yr

+html head

-html story

-html story $title
-html story $body
-html story
-html story posted at: $ti | path: $path | permanent link to this entry -html story

+html story

$title

+html story

$body

+html story

posted at: $ti | path: $path | permanent link to this entry

+html story

-html date

$dw, $da $mo $yr

+html date

$dw, $da $mo $yr

html foot -html foot

-html foot

-html foot +html foot

+html foot

html foot html foot @@ -792,15 +791,17 @@ rss foot error content_type text/html +error head error head -error head -error head

Error: I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.

+error head Error: unknown Blosxom flavour "$flavour" +error head +error head

Error: unknown Blosxom flavour "$flavour"

+error head

I'm afraid this is the first I've heard of a "$flavour" flavoured Blosxom. Try dropping the "/+$flavour" bit from the end of the URL.

+error story

$title

+error story

$body

-error story

$title
-error story $body #

- -error date

$dw, $da $mo $yr

+error date

$dw, $da $mo $yr

error foot error foot