Changeset 1054

Timestamp:

06/10/07 14:45:21 (18 months ago)

Author:

dom

Message:

Add support in output routine for specifying HTTP status code (see #102)

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/OpenGuides/Template.pm (modified) (2 diffs)
• t/50_http_response_codes.t (added)

trunk/MANIFEST

@@ -115 +115 @@
 t/48_google_analytics.t
 t/49_custom_header.t
+t/50_http_response_codes.t
 t/51_display_node.t
 t/52_display_diffs.t

trunk/lib/OpenGuides/Template.pm

@@ -109 +109 @@
 Content-Type: defaults to C<text/html> and is omitted if the
 C<content_type> arg is explicitly set to the blank string.
+
+The HTTP response code may be explictly set with the C<http_status> arg.
 
 =cut
@@ -181 +183 @@
 
     my $header = "";
-    unless ( defined $args{content_type} and $args{content_type} eq "" ) {
-        my $content_type;
-        if ($args{content_type}) {
-            $content_type = $args{content_type};
+    my %cgi_header_args;
+
+    if ( defined $args{content_type} and $args{content_type} eq "" ) {
+        $cgi_header_args{'-type'} = '';
+    } else {
+        if ( $args{content_type} ) {
+            $cgi_header_args{'-type'} = $args{content_type};
         } 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} );
-    }
+            $cgi_header_args{'-type'} = "text/html";
+        }
+        if ( $tt_vars->{http_charset} ) {
+            $cgi_header_args{'-type'} .= "; charset=".$tt_vars->{http_charset};
+        }
+        # XXX should possibly not be inside this block, but retaining
+        # existing functionality for now. See
+        # http://dev.openguides.org/ticket/220
+        $cgi_header_args{'-cookie'} = $args{cookies};
+    }
+
+    if ( $args{http_status} ) {
+        $cgi_header_args{'-status'} = $args{http_status};
+    }
+
+    $header = CGI::header( %cgi_header_args );
 
     # vile hack