rt 4.2.16

[freeside.git] / rt / lib / RT / Interface / Web / Request.pm

diff --git a/rt/lib/RT/Interface/Web/Request.pm b/rt/lib/RT/Interface/Web/Request.pm
index cdd4594..b07048f 100644 (file)
--- a/rt/lib/RT/Interface/Web/Request.pm
+++ b/rt/lib/RT/Interface/Web/Request.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
 #
 # COPYRIGHT:
 #

-# This software is Copyright (c) 1996-2013 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2019 Best Practical Solutions, LLC

 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)


@@ -51,7 +51,6 @@ package RT::Interface::Web::Request;
 use strict;
 use warnings;
 
 use strict;
 use warnings;
 

-our $VERSION = '0.30';

 use HTML::Mason::PSGIHandler;
 use base qw(HTML::Mason::Request::PSGI);
 use Params::Validate qw(:all);
 use HTML::Mason::PSGIHandler;
 use base qw(HTML::Mason::Request::PSGI);
 use Params::Validate qw(:all);


@@ -65,8 +64,6 @@ sub new {
 
 =head2 callback
 
 
 =head2 callback
 

-Method replaces deprecated component C<Element/Callback>.
-

 Takes hash with optional C<CallbackPage>, C<CallbackName>
 and C<CallbackOnce> arguments, other arguments are passed
 throught to callback components.
 Takes hash with optional C<CallbackPage>, C<CallbackName>
 and C<CallbackOnce> arguments, other arguments are passed
 throught to callback components.


@@ -88,6 +85,12 @@ By default is false, otherwise runs callbacks only once per
 process of the server. Such callbacks can be used to fill
 structures.
 
 process of the server. Such callbacks can be used to fill
 structures.
 

+=item ReturnComponentOutput
+
+By default, callback returns the status codes of all rendered components, and
+prints the rendered components to STDOUT. If this argument is true, callback
+returns the rendered components instead of printing them to STDOUT.
+

 =back
 
 Searches for callback components in
 =back
 
 Searches for callback components in


@@ -105,6 +108,7 @@ sub callback {
 
     my $name = delete $args{'CallbackName'} || 'Default';
     my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;
 
     my $name = delete $args{'CallbackName'} || 'Default';
     my $page = delete $args{'CallbackPage'} || $self->callers(0)->path;

+    my $use_scomp = delete $args{'ReturnComponentOutput'} ? 1 : 0;

     unless ( $page ) {
         $RT::Logger->error("Couldn't get a page name for callbacks");
         return;
     unless ( $page ) {
         $RT::Logger->error("Couldn't get a page name for callbacks");
         return;


@@ -137,10 +141,16 @@ sub callback {
     }
 
     my @rv;
     }
 
     my @rv;

+    my $scomp_out;

     foreach my $cb ( @$callbacks ) {
     foreach my $cb ( @$callbacks ) {

-        push @rv, scalar $self->comp( $cb, %args );
+        if ( $use_scomp ) {
+            no warnings 'uninitialized';
+            $scomp_out .= $self->scomp( $cb, %args );
+        } else {
+            push @rv, scalar $self->comp( $cb, %args );
+        }

     }
     }

-    return @rv;
+    return $use_scomp ? $scomp_out : @rv;

 }
 
 sub clear_callback_cache {
 }
 
 sub clear_callback_cache {