X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPresenter.pm;h=36acc73ddf816d3387a9abae6ac05ee4fea7b8fb;hb=bb8964ddfc59e40b62f6e65f5dd38cea9b7323d0;hp=eeeb43fabbcaaaf893154f19417d48c10ea22993;hpb=d445880375bce1462b8f9a8b1a502b34c296d41f;p=kivitendo-erp.git diff --git a/SL/Presenter.pm b/SL/Presenter.pm index eeeb43fab..36acc73dd 100644 --- a/SL/Presenter.pm +++ b/SL/Presenter.pm @@ -16,8 +16,7 @@ use SL::Presenter::Project; use SL::Presenter::Record; sub get { - $::request->{presenter} ||= SL::Presenter->new; - return $::request->{presenter}; + return $::request->presenter; } sub render { @@ -25,17 +24,57 @@ sub render { my $template = shift; my ($options, %locals) = (@_ && ref($_[0])) ? @_ : ({ }, @_); - $options->{type} = lc($options->{type} || 'html'); + # Set defaults for all available options. + my %defaults = ( + type => 'html', + process => 1, + ); + $options->{$_} //= $defaults{$_} for keys %defaults; + $options->{type} = lc $options->{type}; - my $source; - if ($options->{inline}) { - $source = \$template; + # Check supplied options for validity. + foreach (keys %{ $options }) { + croak "Unsupported option: $_" unless $defaults{$_}; + } - } else { + # Only certain types are supported. + croak "Unsupported type: " . $options->{type} unless $options->{type} =~ m/^(?:html|js|json)$/; + + # The "template" argument must be a string or a reference to one. + $template = ${ $template } if ((ref($template) || '') eq 'REF') && (ref(${ $template }) eq 'SL::Presenter::EscapedText'); + croak "Unsupported 'template' reference type: " . ref($template) if ref($template) && (ref($template) !~ m/^(?:SCALAR|SL::Presenter::EscapedText)$/); + + # Look for the file given by $template if $template is not a reference. + my $source; + if (!ref $template) { $source = "templates/webpages/${template}." . $options->{type}; croak "Template file ${source} not found" unless -f $source; + + } elsif (ref($template) eq 'SCALAR') { + # Normal scalar reference: hand over to Template + $source = $template; + + } else { + # Instance of SL::Presenter::EscapedText. Get reference to its content. + $source = \$template->{text}; } + # If no processing is requested then return the content. + if (!$options->{process}) { + # If $template is a reference then don't try to read a file. + my $ref = ref $template; + return $template if $ref eq 'SL::Presenter::EscapedText'; + return SL::Presenter::EscapedText->new(text => ${ $template }, is_escaped => 1) if $ref eq 'SCALAR'; + + # Otherwise return the file's content. + my $file = IO::File->new($source, "r") || croak("Template file ${source} could not be read"); + my $content = do { local $/ = ''; <$file> }; + $file->close; + + return SL::Presenter::EscapedText->new(text => $content, is_escaped => 1); + } + + # Processing was requested. Set up all variables. my %params = ( %locals, AUTH => $::auth, FLASH => $::form->{FLASH}, @@ -85,6 +124,16 @@ sub escaped_text { return SL::Presenter::EscapedText->new(text => $text, is_escaped => 1); } +sub escape_js { + my ($self, $text) = @_; + + $text =~ s|\\|\\\\|g; + $text =~ s|\"|\\\"|g; + $text =~ s|\n|\\n|g; + + return SL::Presenter::EscapedText->new(text => $text, is_escaped => 1); +} + 1; __END__ @@ -147,20 +196,45 @@ controller. Therefore the presenter's L function does not use all of the parameters for controlling the output that the controller's function does. -What is rendered and how C<$template> is interpreted is determined by -the options I and I. +What is rendered and how C<$template> is interpreted is determined +both by C<$template>'s reference type and by the supplied options. -If C<< $options->{inline} >> is trueish then C<$template> is a string -containing the template code to interprete. +If C<$template> is a normal scalar (not a reference) then it is meant +to be a template file name relative to the C +directory. The file name to use is determined by the C option. -If C<< $options->{inline} >> is falsish then C<$template> is -interpreted as the name of a template file. It is prefixed with -"templates/webpages/" and postfixed with a file extension based on -C<< $options->{type} >>. C<< $options->{type} >> can be either C -or C and defaults to C. An exception will be thrown if that -file does not exist. +If C<$template> is a reference to a scalar then the referenced +scalar's content is used as the content to process. The C option +is not considered in this case. -The template itself has access to the following variables: +C<$template> can also be an instance of L +or a reference to such an instance. Both of these cases are handled +the same way as if C<$template> were a reference to a scalar: its +content is processed, and C is not considered. + +Other reference types, unknown options and unknown arguments to the +C option cause the function to L. + +The following options are available: + +=over 2 + +=item C + +The template type. Can be C (the default), C for JavaScript +or C for JSON content. Affects only the extension that's added +to the file name given with a non-reference C<$template> argument. + +=item C + +If trueish (which is also the default) it causes the template/content +to be processed by the Template toolkit. Otherwise the +template/content is returned as-is. + +=back + +If template processing is requested then the template has access to +the following variables: =over 2 @@ -197,9 +271,14 @@ Example: Render a HTML template with a certain title and a few locals Example: Render a string and return its content for further processing by the calling function. - my $content = $presenter->render( - '[% USE JavaScript %][% JavaScript.replace_with("#someid", "js/something") %]', - { type => 'js' } + my $content = $presenter->render(\'[% USE JavaScript %][% JavaScript.replace_with("#someid", "js/something") %]'); + +Example: Return the content of a JSON template file without processing +it at all: + + my $template_content = $presenter->render( + 'customer/contact', + { type => 'json', process => 0 } ); =item C @@ -221,6 +300,16 @@ It is safe to call C on an instance of L. This is a no-op (the same instance will be returned). +=item C + +Returns a JavaScript-escaped version of C<$text>. Instead of a string +an instance of the thin proxy-object L is +returned. + +It is safe to call C on an instance of +L. This is a no-op (the same instance will +be returned). + =item C Returns the global instance of L