X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FPresenter.pm;h=cd4f4e17e97aa2d5d9a48ad4a7612265162c2d16;hb=826d79929635c726f7459296fafa7e630c00e72d;hp=6658184c19bc6caf85b27d7f4137f45e64d2b404;hpb=7c9fc25b6893a1ea508185a0f1a197d6b46f187a;p=kivitendo-erp.git

diff --git a/SL/Presenter.pm b/SL/Presenter.pm
index 6658184c1..cd4f4e17e 100644
--- a/SL/Presenter.pm
+++ b/SL/Presenter.pm
@@ -7,13 +7,29 @@ use parent qw(Rose::Object);
 use Carp;
 use Template;
 
+use SL::Presenter::Chart;
 use SL::Presenter::CustomerVendor;
 use SL::Presenter::DeliveryOrder;
 use SL::Presenter::EscapedText;
 use SL::Presenter::Invoice;
+use SL::Presenter::GL;
+use SL::Presenter::Letter;
 use SL::Presenter::Order;
+use SL::Presenter::Part;
 use SL::Presenter::Project;
 use SL::Presenter::Record;
+use SL::Presenter::RequirementSpec;
+use SL::Presenter::RequirementSpecItem;
+use SL::Presenter::RequirementSpecTextBlock;
+use SL::Presenter::SepaExport;
+use SL::Presenter::ShopOrder;
+use SL::Presenter::Text;
+use SL::Presenter::Tag;
+use SL::Presenter::BankAccount;
+
+use Rose::Object::MakeMethods::Generic (
+  scalar => [ qw(need_reinit_widgets) ],
+);
 
 sub get {
   return $::request->presenter;
@@ -38,15 +54,17 @@ sub render {
   }
 
   # Only certain types are supported.
-  croak "Unsupported type: " . $options->{type} unless $options->{type} =~ m/^(?:html|js|json)$/;
+  croak "Unsupported type: " . $options->{type} unless $options->{type} =~ m/^(?:html|js|json|text)$/;
 
   # 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};
+    my $ext = $options->{type} eq 'text' ? 'txt' : $options->{type};
+    $source = "templates/webpages/${template}.${ext}";
     croak "Template file ${source} not found" unless -f $source;
 
   } elsif (ref($template) eq 'SCALAR') {
@@ -61,7 +79,9 @@ sub render {
   # 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.
-    return SL::Presenter::EscapedText->new(text => ${ $template }, is_escaped => 1) if ref $template;
+    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");
@@ -94,6 +114,8 @@ sub render {
 sub get_template {
   my ($self) = @_;
 
+  # Make locales.pl parse generic/exception.html, too:
+  # $::form->parse_html_template("generic/exception")
   $self->{template} ||=
     Template->new({ INTERPOLATE  => 0,
                     EVAL_PERL    => 0,
@@ -104,6 +126,7 @@ sub get_template {
                     COMPILE_EXT  => '.tcc',
                     COMPILE_DIR  => $::lx_office_conf{paths}->{userspath} . '/templates-cache',
                     ERROR        => 'templates/webpages/generic/exception.html',
+                    ENCODING     => 'utf8',
                   }) || croak;
 
   return $self->{template};
@@ -121,6 +144,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__
@@ -194,6 +227,11 @@ If C<$template> is a reference to a scalar then the referenced
 scalar's content is used as the content to process. The C<type> option
 is not considered in this case.
 
+C<$template> can also be an instance of L<SL::Presenter::EscapedText>
+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<type> is not considered.
+
 Other reference types, unknown options and unknown arguments to the
 C<type> option cause the function to L<croak>.
 
@@ -203,9 +241,10 @@ The following options are available:
 
 =item C<type>
 
-The template type. Can be C<html> (the default), C<js> for JavaScript
-or C<json> for JSON content. Affects only the extension that's added
-to the file name given with a non-reference C<$template> argument.
+The template type. Can be C<html> (the default), C<js> for JavaScript,
+C<json> for JSON and C<text> for plain text content. Affects only the
+extension that's added to the file name given with a non-reference
+C<$template> argument.
 
 =item C<process>
 
@@ -222,13 +261,17 @@ the following variables:
 
 =item * C<AUTH> -- C<$::auth>
 
+=item * C<FLASH> -- the flash instance (C<$::form-E<gt>{FLASH}>)
+
 =item * C<FORM> -- C<$::form>
 
+=item * C<INSTANCE_CONF> -- C<$::instance_conf>
+
 =item * C<LOCALE> -- C<$::locale>
 
 =item * C<LXCONFIG> -- all parameters from C<config/kivitendo.conf>
 with the same name they appear in the file (first level is the
-section, second the actual variable, e.g. C<system.dbcharset>,
+section, second the actual variable, e.g. C<system.language>,
 C<features.webdav> etc)
 
 =item * C<LXDEBUG> -- C<$::lxdebug>
@@ -237,6 +280,9 @@ C<features.webdav> etc)
 
 =item * C<SELF> -- the controller instance
 
+=item * C<PRESENTER> -- the presenter instance the template is
+rendered with
+
 =item * All items from C<%locals>
 
 =back
@@ -282,6 +328,16 @@ It is safe to call C<escaped_text> on an instance of
 L<SL::Presenter::EscapedText>. This is a no-op (the same instance will
 be returned).
 
+=item C<escape_js $text>
+
+Returns a JavaScript-escaped version of C<$text>. Instead of a string
+an instance of the thin proxy-object L<SL::Presenter::EscapedText> is
+returned.
+
+It is safe to call C<escape> on an instance of
+L<SL::Presenter::EscapedText>. This is a no-op (the same instance will
+be returned).
+
 =item C<get_template>
 
 Returns the global instance of L<Template> and creates it if it