Add $date_first_in_url configuration variable.

[matthijs/upstream/blosxom.git] / blosxom.cgi

diff --git a/blosxom.cgi b/blosxom.cgi
index b3c3ef08b997405069631edc990d8edbe2b7335c..9cef4da472926f660424a54ed4d4f07593cfc5bc 100755 (executable)
--- a/blosxom.cgi
+++ b/blosxom.cgi
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 
 # Blosxom
-# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2008)
-# Version: 2.1.2 ($Id: blosxom.cgi,v 1.94 2009/03/08 01:18:11 xtaran Exp $)
+# Author: Rael Dornfest (2002-2003), The Blosxom Development Team (2005-2009)
+# Version: 2.1.2 ($Id: blosxom.cgi,v 1.98 2009/07/19 17:18:37 xtaran Exp $)
 # Home/Docs/Licensing: http://blosxom.sourceforge.net/
 # Development/Downloads: http://sourceforge.net/projects/blosxom
 
@@ -99,6 +99,14 @@ $default_flavour = "html";
 # Should I show entries from the future (i.e. dated after now)?
 $show_future_entries = 0;
 
+# Should date components of the path always be at the front?
+# If this is disabled, the date components can appear anywhere in the
+# url (but always directly after each other, in the year/month/day
+# order). For example, /category/subcategory/2008/12/ (or even
+# /category/2008/12/subcategory/) shows all posts in subcategory from
+# December 2008.
+$date_first_in_url = 0;
+
 # --- Plugins (Optional) -----
 
 # File listing plugins blosxom should load (if empty blosxom will load
@@ -142,6 +150,11 @@ $encode_xml_entities = 1;
 # can change this, too)
 $encode_8bit_chars = 0;
 
+# RegExp matching all characters which should be URL encoded in links.
+# Defaults to anything but numbers, letters, slash, colon, dash,
+# underscore and dot.
+$url_escape_re = qr([^-/a-zA-Z0-9:._]);
+
 # --------------------------------
 
 =head1 ENVIRONMENT
@@ -232,11 +245,13 @@ use vars qw!
     $output
     $header
     $show_future_entries
+    $date_first_in_url
     %files
     %indexes
     %others
     $encode_xml_entities
     $encode_8bit_chars
+    $url_escape_re
     $content_type
 !;
 
@@ -389,9 +404,12 @@ sub blosxom_html_escape {
 
 # Global variable to be used in head/foot.{flavour} templates
 $path_info = '';
-# Add all @path_info elements to $path_info till we come to one that could be a year
-while ( $path_info[0] && $path_info[0] !~ /^(19|20)\d{2}$/) {
-    $path_info .= '/' . shift @path_info;
+
+if (!$date_first_in_url) {
+       # Add all @path_info elements to $path_info till we come to one that could be a year
+       while ( $path_info[0] && $path_info[0] !~ /^(19|20)\d{2}$/) {
+               $path_info .= '/' . shift @path_info;
+       }
 }
 
 # Pull date elements out of path
@@ -852,18 +870,20 @@ sub generate {
                 }
             }
 
+           # Save unescaped versions and allow them to be used in
+           # flavour templates.
+           use vars qw/$url_unesc $path_unesc $fn_unesc/;
+           $url_unesc  = $url;
+           $path_unesc = $path;
+           $fn_unesc   = $fn;
+
+           # Fix special characters in links inside XML content
             if ( $encode_xml_entities &&
                  $content_type =~ m{\bxml\b} &&
                  $content_type !~ m{\bxhtml\b} ) {
                 # Escape special characters inside the <link> container
 
-                # The following line should be moved more towards to top for
-                # performance reasons -- Axel Beckert, 2008-07-22
-                my $url_escape_re = qr([^-/a-zA-Z0-9:._]);
-
-                $url   =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
-                $path  =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
-                $fn    =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+               &url_escape_url_path_and_fn();
 
                 # Escape <, >, and &, and to produce valid RSS
                 $title = blosxom_html_escape($title);
@@ -873,10 +893,9 @@ sub generate {
                 $fn    = blosxom_html_escape($fn);
             }
 
+           # Fix special characters in links inside XML content
             if ($encode_8bit_chars) {
-                $url   =~ s([^-a-zA-Z0-9_./:])(sprintf('%%%02X', ord($&)))ge;
-                $path  =~ s([^-a-zA-Z0-9_./:])(sprintf('%%%02X', ord($&)))ge;
-                $fn    =~ s([^-a-zA-Z0-9_./:])(sprintf('%%%02X', ord($&)))ge;
+               &url_escape_url_path_and_fn();
             }
 
             $story = &$interpolate($story);
@@ -936,6 +955,12 @@ sub nice_date {
     return ( $dw, $mo, $mo_num, $da, $ti, $yr, $utc_offset );
 }
 
+sub url_escape_url_path_and_fn {
+    $url   =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+    $path  =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+    $fn    =~ s($url_escape_re)(sprintf('%%%02X', ord($&)))eg;
+}
+
 # Default HTML and RSS template bits
 __DATA__
 html content_type text/html; charset=$blog_encoding