Changeset 868

Timestamp:

09/17/06 16:26:21 (2 years ago)

Author:

nick

Message:

Support the config flag http_charset, which sets a http charset header on content type. (Closes #141)

Location:

trunk

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/OpenGuides/Config.pm (modified) (4 diffs)
• lib/OpenGuides/Template.pm (modified) (2 diffs)
• t/18_http_headers.t (added)

trunk/Changes

@@ -5 +5 @@
         Add UPGRADING file which summarises inmportant information for people
         upgrading.
+        Add an optional new config parameter, http_charset, which will set
+         an explict charset http header on all responses.
 
 0.57    12 September 2006

trunk/MANIFEST

@@ -73 +73 @@
 t/16_test_tester.t
 t/17_commit_node.t
+t/18_http_headers.t
 t/21_rdf.t
 t/22_feed_recent_changes.t

trunk/lib/OpenGuides/Config.pm

@@ -9 +9 @@
    custom_lib_path use_plucene indexing_directory enable_page_deletion
    admin_pass stylesheet_url site_name navbar_on_home_page home_name
-   site_desc default_city default_country contact_email default_language
+   site_desc default_city default_country contact_email 
+   default_language http_charset
    formatting_rules_node formatting_rules_link backlinks_in_title template_path
    custom_template_path geo_handler ellipsoid gmaps_api_key centre_long
@@ -80 +81 @@
                      default_country => "",
                      default_language => "en",
+                     http_charset => "",
                      formatting_rules_node => "Text Formatting Examples",
                      formatting_rules_link => "http://openguides.org/page/text_formatting",
@@ -150 +152 @@
         contact_email => "Contact email address for the site administrator?",
         default_language => "What language will the site be in? (Please give an ISO language code.)",
+        http_charset => "What character set should we put in the http headers? (This won't change the character set internally, just what it's reported as). Leave blank for none to be sent",
         formatting_rules_node => "What's the name of the node or page to use for the text formatting rules link (this is by default an external document, but if you make formatting_rules_link empty, it will be a wiki node instead",
         formatting_rules_link => "What URL do you want to use for the text formatting rules (leave blank to use a wiki node instead)?",
@@ -239 +242 @@
 =item * default_language (default: C<en>)
 
+=item * http_charset
+
 =item * contact_email
 

trunk/lib/OpenGuides/Template.pm

@@ -161 +161 @@
         enable_page_deletion  => $enable_page_deletion,
         language              => $config->default_language,
+        http_charset          => $config->http_charset,
         default_city          => $default_city,
         gmaps_api_key         => $config->gmaps_api_key,
@@ -184 +185 @@
         } else {
             $content_type = "text/html";
+        }
+        if ($tt_vars->{http_charset}) {
+            $content_type .= "; charset=".$tt_vars->{http_charset};
         }
         $header = CGI::header( -type => $content_type, -cookie => $args{cookies} );