fixed bug 22899 + broken link in manual contents, removed some warnings, fixed DFV...

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

diff --git a/lib/Apache/MVC.pm b/lib/Apache/MVC.pm
index 3fcdaacf0c8b701586cbed5ccc3e492f6af0fce9..831527639e58336d5cb0afb8af647cbeaf1fb5eb 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,10 +93,30 @@ 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);
 }
 
+=item warn
+
+=cut
+
+sub warn {
+  my ($self,@args) = @_;
+  my ($package, $line) = (caller)[0,2];
+  if ( $args[0] and ref $self ) {
+    $self->{ar}->warn("[$package line $line] ", @args) ;
+  } else {
+    print "warn called by ", caller, " with ", @_, "\n";
+  }
+  return;
+}
+
+
 =item parse_location
 
 =cut
@@ -114,15 +132,21 @@ sub parse_location {
     for (keys %headers) {
         $self->headers_in->set($_, $headers{$_});
     }
+
     my $path = $self->ar->uri;
     my $loc  = $self->ar->location;
+
     {
         no warnings 'uninitialized';
         $path .= '/' if $path eq $loc;
-        $path =~ s/^($loc)?\///;
+       if ($loc =~ /\/$/) {
+         $path =~ s/^($loc)?//;
+       } else {
+         $path =~ s/^($loc)?\///;
+       }
     }
+
     $self->path($path);
-    
     $self->parse_path;
     $self->parse_args;
 }
@@ -139,10 +163,26 @@ sub parse_args {
 
 =item redirect_request
 
+Sets output headers to redirect based on the arguments provided
+
+Accepts either a single argument of the full url to redirect to, or a hash of
+named parameters :
+
+$r->redirect_request('http://www.example.com/path');
+
+or
+
+$r->redirect_request(protocol=>'https', domain=>'www.example.com', path=>'/path/file?arguments', status=>'302', url=>'..');
+
+The named parameters are protocol, domain, path, status and url
+
+Only 1 named parameter is required but other than url, they can be combined as
+required and current values (from the request) will be used in place of any
+missing arguments. The url argument must be a full url including protocol and
+can only be combined with status.
+
 =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
 {
   my $r = shift;
@@ -164,7 +204,6 @@ sub redirect_request
 
   $r->ar->status($status);
   $r->ar->headers_out->set('Location' => $redirect_url);
-  #$r->output("");
   return OK;
 }
 
@@ -230,6 +269,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;
 }