Changeset 1091 for trunk/lib/OpenGuides/Template.pm

Timestamp:

06/18/07 16:20:16 (18 months ago)

Author:

dom

Message:

Add noheaders option, and use that in preference to black content_type
arg. (fixes #220)

Files:

• trunk/lib/OpenGuides/Template.pm (modified) (4 diffs)

trunk/lib/OpenGuides/Template.pm

@@ -51 +51 @@
                                       content_type => "text/html",
                                       cookies      => $cookie,
-                                      vars         => {foo => "bar"}
+                                      vars         => {foo => "bar"},
+                                      noheaders    => 1
   );
 
@@ -111 +112 @@
 Content-Type: defaults to C<text/html> and is omitted if the
 C<content_type> arg is explicitly set to the blank string.
+
+However, what you more often need is the C<noheaders> option,
+which suppresses all HTTP headers, not just the Content-Type.
 
 The HTTP response code may be explictly set with the C<http_status> arg.
@@ -188 +192 @@
 
     my $header = "";
-    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};
+
+    unless ( $args{noheaders} ) {
+        my %cgi_header_args;
+
+        if ( defined $args{content_type} and $args{content_type} eq "" ) {
+            $cgi_header_args{'-type'} = '';
         } else {
-            $cgi_header_args{'-type'} = "text/html";
-        }
+            if ( $args{content_type} ) {
+                $cgi_header_args{'-type'} = $args{content_type};
+            } else {
+                $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 );
+
+        if ( $args{http_status} ) {
+            $cgi_header_args{'-status'} = $args{http_status};
+        }
+
+        $header = CGI::header( %cgi_header_args );
+    }
 
     # vile hack
@@ -220 +225 @@
                          metadata => {},
                      );
-                     
+
     $tt_vars = { %field_vars, %$tt_vars };