X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FCGI%2FMaypole.pm;h=a4835b8a3c6adfdc74d37e636577d7b4c0a3a572;hb=7c1eccbb6e4b547e61e82ece501c824785c25480;hp=94fd27b3f79458245154e584a4dc4c596cf73176;hpb=f9a6b47b3b916585d710eac141003fb8261d9c3c;p=maypole.git

diff --git a/lib/CGI/Maypole.pm b/lib/CGI/Maypole.pm
index 94fd27b..a4835b8 100644
--- a/lib/CGI/Maypole.pm
+++ b/lib/CGI/Maypole.pm
@@ -5,8 +5,9 @@ use strict;
 use warnings;
 use CGI::Simple;
 use Maypole::Headers;
+use Maypole::Constants;
 
-our $VERSION = '2.05';
+our $VERSION = '2.10';
 
 sub run {
     my $self = shift;
@@ -17,6 +18,11 @@ sub get_request {
     shift->{cgi} = CGI::Simple->new();
 }
 
+sub get_protocol {
+  my $self = shift;
+  my $protocol = ($self->{cgi}->https()) ? 'https' : 'http';
+  return $protocol;
+}
 
 sub parse_location {
     my $self = shift;
@@ -49,6 +55,32 @@ sub parse_args {
     $self->{query}  = {%vars};
 }
 
+# FIXME: use headers_in to gather host and other information?
+sub redirect_request {
+  my $self = shift;
+  my $redirect_url = $_[0];
+  my $status = "302";
+  if ($_[1]) {
+    my %args = @_;
+    if ($args{url}) {
+      $redirect_url = $args{url};
+    } else {
+      my $path = $args{path} || $self->{cgi}->url(-absolute => 1, -query=>1);
+      my $host = $args{domain};
+      ($host = $self->{cgi}->url(-base => 1)) =~ s/^https?:\/\///i unless ($host);
+      my $protocol = $args{protocol} || ($self->{cgi}->https()) ? 'https' : 'http';
+      $redirect_url = "${protocol}://${host}/${path}";
+    }
+    $status = $args{status} if ($args{status});
+  }
+
+  $self->headers_out->set('Status' => $status);
+  $self->headers_out->set('Location' => $redirect_url);
+
+  return;
+}
+
+
 sub send_output {
     my $r = shift;
 
@@ -58,8 +90,8 @@ sub send_output {
         -charset         => $r->{document_encoding},
         -content_length  => do { use bytes; length $r->{output} },
     );
-    foreach ($r->headers_out->header_field_names) {
-        next if /^Content-/;
+    foreach ($r->headers_out->field_names) {
+        next if /^Content-(Type|Length)/;
         $headers{"-$_"} = $r->headers_out->get($_);
     }
 
@@ -101,10 +133,15 @@ CGI::Maypole - CGI-based front-end to Maypole
 Now to access the beer database, type this URL into your browser:
 http://your.site/cgi-bin/beer.cgi/frontpage
 
+NOTE: this Maypole frontend requires additional modules that won't be installed or included with Maypole. Please see below.
+
 =head1 DESCRIPTION
 
-This is a handler for Maypole which will use the CGI instead of Apache's
-C<mod_perl> 1.x. This handler can also be used for Apache 2.0.
+This is a CGI platform driver for Maypole. Your application can inherit from
+CGI::Maypole directly, but it is recommended that you use
+L<Maypole::Application>.
+
+This module requires CGI::Simple which you will have to install yourself via CPAN or manually.
 
 =head1 METHODS
 
@@ -118,7 +155,7 @@ Call this from your CGI script to start the Maypole application.
 
 =head1 Implementation
 
-This class overrides a set of methods in the base Maypole class to provide it's 
+This class overrides a set of methods in the base Maypole class to provide it's
 functionality. See L<Maypole> for these:
 
 =over
@@ -127,16 +164,27 @@ functionality. See L<Maypole> for these:
 
 =item get_template_root
 
+=item get_protocol
+
 =item parse_args
 
 =item parse_location
 
 =item send_output
 
+=item redirect_request
+
+
 =back
 
+=head1 DEPENDANCIES
+
+CGI::Simple
+
 =head1 AUTHORS
 
 Dave Ranney C<dave@sialia.com>
 
 Simon Cozens C<simon@cpan.org>
+
+=cut