Maypole-2.111.tar.gz

[maypole.git] / lib / Apache / MVC.pm

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 3fcdaacf0c8b701586cbed5ccc3e492f6af0fce9..4d32dc43f6d260048ae47e5e41eb719728c8d9ac 100644 (file)
--- a/lib/Apache/MVC.pm
+++ b/lib/Apache/MVC.pm
@@ -5,6 +5,9 @@ our $VERSION = '2.11';
 use strict;
 use warnings;
 
+use URI;
+use URI::QueryParam;
+
 use base 'Maypole';
 use Maypole::Headers;
 use Maypole::Constants;
@@ -14,10 +17,7 @@ __PACKAGE__->mk_accessors( qw( ar ) );
 our $MODPERL2;
 our $modperl_version;
 
-# pjs -- fixed to use standard way from perl.apache.org
 BEGIN {
-    #eval 'use Apache;'; # could fuck shit up if you have some file na
-    # named Apache.pm in your path forex CGI/Apache.pm
     $MODPERL2  = ( exists $ENV{MOD_PERL_API_VERSION} and
                         $ENV{MOD_PERL_API_VERSION} >= 2 );
     if ($MODPERL2) {
@@ -41,8 +41,6 @@ BEGIN {
 
 }
 
-
-
 =head1 NAME
 
 Apache::MVC - Apache front-end to Maypole
@@ -95,7 +93,11 @@ functionality. See L<Maypole> for these:
 
 sub get_request {
     my ($self, $r) = @_;
-    my $ar = ($MODPERL2) ? $r : Apache::Request->instance($r);
+    my $ar;
+    if ($MODPERL2) {
+       $ar = eval {require Apache2::Request} ? Apache2::Request->new($r) : $r;
+       }
+    else { $ar = Apache::Request->instance($r); }
     $self->ar($ar);
 }
 
@@ -122,7 +124,6 @@ sub parse_location {
         $path =~ s/^($loc)?\///;
     }
     $self->path($path);
-    
     $self->parse_path;
     $self->parse_args;
 }
@@ -141,10 +142,7 @@ sub parse_args {
 
 =cut
 
-# FIXME: use headers_in to gather host and other information?
-# pjs 4-7-06 fixed so it works but did not fix headers_in issue  
-sub redirect_request
-{
+sub redirect_request {
   my $r = shift;
   my $redirect_url = $_[0];
   my $status = $MODPERL2 ? eval 'Apache2::Const::REDIRECT;' :
@@ -157,14 +155,17 @@ sub redirect_request
       my $path = $args{path} || $r->path;
       my $host = $args{domain} || $r->ar->hostname;
       my $protocol = $args{protocol} || $r->get_protocol;
-      $redirect_url = "${protocol}://${host}/${path}";
+
+      $redirect_url = URI->new;
+         $redirect_url->scheme($protocol);
+         $redirect_url->host($host);
+         $redirect_url->path($path);
     }
     $status = $args{status} if ($args{status});
   }
 
   $r->ar->status($status);
   $r->ar->headers_out->set('Location' => $redirect_url);
-  #$r->output("");
   return OK;
 }
 
@@ -230,6 +231,23 @@ sub _mod_perl_args {
     } else {
       my $body = $self->_prepare_body($apr);
       %args = %{$body->param};
+      my $uri = URI->new($self->ar->unparsed_uri);
+      foreach my $key ($uri->query_param) {
+       if (ref $args{$key}) {
+         push (@{$args{$key}}, $uri->query_param($key));
+       } else {
+         if ($args{$key}) {
+           $args{$key} = [ $args{$key}, $uri->query_param($key) ];
+         } else {
+           my @args = $uri->query_param($key);
+           if (scalar @args > 1) {
+             $args{$key} = [ $uri->query_param($key) ];
+           } else {
+             $args{$key} = $uri->query_param($key);
+           }
+         }
+       }
+      }
     }
     return %args;
 }