Benutzerdef. Var. als HTML-Feld: CSV-Import

[mfinanz.git] / SL / Controller / Base.pm

diff --git a/SL/Controller/Base.pm b/SL/Controller/Base.pm
index c6977d0e10b6941f7e416eeed4c192479a50a5eb..5e0fd26cb5a9aff6e223dbc649ef008b5a602239 100644 (file)
--- a/SL/Controller/Base.pm
+++ b/SL/Controller/Base.pm
@@ -7,13 +7,15 @@ use parent qw(Rose::Object);
 use Carp;
 use IO::File;
 use List::Util qw(first);
 use Carp;
 use IO::File;
 use List::Util qw(first);

+use MIME::Base64;

 use SL::Request qw(flatten);
 use SL::MoreCommon qw(uri_encode);
 use SL::Presenter;
 
 use Rose::Object::MakeMethods::Generic
 (
 use SL::Request qw(flatten);
 use SL::MoreCommon qw(uri_encode);
 use SL::Presenter;
 
 use Rose::Object::MakeMethods::Generic
 (

-  scalar => [ qw(action_name) ],
+  scalar                  => [ qw(action_name) ],
+  'scalar --get_set_init' => [ qw(js) ],

 );
 
 #
 );
 
 #


@@ -28,6 +30,7 @@ sub url_for {
   my %params      = ref($_[0]) eq 'HASH' ? %{ $_[0] } : @_;
   my $controller  = delete($params{controller}) || $self->controller_name;
   my $action      = $params{action}             || 'dispatch';
   my %params      = ref($_[0]) eq 'HASH' ? %{ $_[0] } : @_;
   my $controller  = delete($params{controller}) || $self->controller_name;
   my $action      = $params{action}             || 'dispatch';

+  my $fragment    = delete $params{fragment};

 
   my $script;
   if ($controller =~ m/\.pl$/) {
 
   my $script;
   if ($controller =~ m/\.pl$/) {


@@ -40,7 +43,7 @@ sub url_for {
 
   my $query       = join '&', map { uri_encode($_->[0]) . '=' . uri_encode($_->[1]) } @{ flatten(\%params) };
 
 
   my $query       = join '&', map { uri_encode($_->[0]) . '=' . uri_encode($_->[1]) } @{ flatten(\%params) };
 

-  return "${script}?${query}";
+  return "${script}?${query}" . (defined $fragment ? "#$fragment" : '');

 }
 
 sub redirect_to {
 }
 
 sub redirect_to {


@@ -52,7 +55,7 @@ sub redirect_to {
     SL::Helper::Flash::delay_flash();
   }
 
     SL::Helper::Flash::delay_flash();
   }
 

-  return $self->render(SL::ClientJS->new->redirect_to($self->url_for(@_))) if $::request->is_ajax;
+  return $self->render(SL::ClientJS->new->redirect_to($url)) if $::request->is_ajax;

 
   print $::request->{cgi}->redirect($url);
 }
 
   print $::request->{cgi}->redirect($url);
 }


@@ -72,6 +75,7 @@ sub render {
     header     => 1,
     layout     => 1,
     process    => 1,
     header     => 1,
     layout     => 1,
     process    => 1,

+    status     => '200 ok',

   );
   $options->{$_} //= $defaults{$_} for keys %defaults;
   $options->{type} = lc $options->{type};
   );
   $options->{$_} //= $defaults{$_} for keys %defaults;
   $options->{type} = lc $options->{type};


@@ -98,6 +102,18 @@ sub render {
     $options->{layout} = 0 if $options->{type} ne 'html';
   }
 
     $options->{layout} = 0 if $options->{type} ne 'html';
   }
 

+  # Let the presenter do the rest of the work.
+  my $output;
+  {
+    local $::form->{title} = $locals{title} if $locals{title};
+    $output = $self->presenter->render(
+      $template,
+      { type => $options->{type}, process => $options->{process} },
+      %locals,
+      SELF => $self,
+    );
+  }
+

   if ($options->{header}) {
     # Output the HTTP response and the layout in case of HTML output.
 
   if ($options->{header}) {
     # Output the HTTP response and the layout in case of HTML output.
 


@@ -116,18 +132,11 @@ sub render {
                         :                              'application/json';
 
       print $::form->create_http_response(content_type => $content_type,
                         :                              'application/json';
 
       print $::form->create_http_response(content_type => $content_type,

-                                          charset      => $::lx_office_conf{system}->{dbcharset} || Common::DEFAULT_CHARSET());
+                                          charset      => 'UTF-8',
+                                          (status      => $options->{status}) x !!$options->{status});

     }
   }
 
     }
   }
 

-  # Let the presenter do the rest of the work.
-  my $output = $self->presenter->render(
-    $template,
-    { type => $options->{type}, process => $options->{process} },
-    %locals,
-    SELF => $self,
-  );
-

   # Print the output if wanted.
   print $output if $options->{output};
 
   # Print the output if wanted.
   print $output if $options->{output};
 


@@ -135,19 +144,40 @@ sub render {
 }
 
 sub send_file {
 }
 
 sub send_file {

-  my ($self, $file_name, %params) = @_;
+  my ($self, $file_name_or_content, %params) = @_;
+
+  my ($file, $size);
+
+  if (!ref $file_name_or_content) {
+    $file = IO::File->new($file_name_or_content, 'r') || croak("Cannot open file '${file_name_or_content}'");
+    $size = -s $file_name_or_content;
+  } else {
+    $size = length $$file_name_or_content;
+  }

 
 

-  my $file            = IO::File->new($file_name, 'r') || croak("Cannot open file '${file_name}'");

   my $content_type    =  $params{type} || 'application/octet_stream';
   my $content_type    =  $params{type} || 'application/octet_stream';

-  my $attachment_name =  $params{name} || $file_name;
+  my $attachment_name =  $params{name} || (!ref($file_name_or_content) ? $file_name_or_content : '');

   $attachment_name    =~ s:.*//::g;
 
   $attachment_name    =~ s:.*//::g;
 

-  print $::form->create_http_response(content_type        => $content_type,
-                                      content_disposition => 'attachment; filename="' . $attachment_name . '"',
-                                      content_length      => -s $file);
+  if ($::request->is_ajax || $params{ajax}) {
+    my $octets = ref $file_name_or_content ? $file_name_or_content : \ do { local $/ = undef; <$file> };
+    $self->js->save_file(MIME::Base64::encode_base64($$octets), $content_type, $size, $attachment_name);
+    $self->js->render unless $params{js_no_render};
+  } else {
+    print $::form->create_http_response(content_type        => $content_type,
+                                        content_disposition => 'attachment; filename="' . $attachment_name . '"',
+                                        content_length      => $size);
+
+    if (!ref $file_name_or_content) {
+      $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
+      $file->close;
+      unlink $file_name_or_content if $params{unlink};
+    } else {
+      $::locale->with_raw_io(\*STDOUT, sub { print $$file_name_or_content });
+    }
+  }

 
 

-  $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
-  $file->close;
+  return 1;

 }
 
 sub presenter {
 }
 
 sub presenter {


@@ -160,6 +190,10 @@ sub controller_name {
   return $class;
 }
 
   return $class;
 }
 

+sub init_js {
+  SL::ClientJS->new(controller => $_[0])
+}
+

 #
 # Before/after run hooks
 #
 #
 # Before/after run hooks
 #


@@ -460,10 +494,15 @@ browser. Typical use for actions called via AJAX:
   $self->render('todo/single_item', { type => 'js' },
                 item => $employee->most_important_todo_item);
 
   $self->render('todo/single_item', { type => 'js' },
                 item => $employee->most_important_todo_item);
 

-=item C<send_file $file_name, [%params]>
+=item C<send_file $file_name_or_content, [%params]>
+
+Sends the file C<$file_name_or_content> to the browser including
+appropriate HTTP headers for a download. If C<$file_name_or_content>
+is a scalar then it is interpreted as a file name which is opened and
+whose content is sent. Otherwise (C<$file_name_or_content> being a
+reference) the referenced scalar's data itself is sent.

 
 

-Sends the file C<$file_name> to the browser including appropriate HTTP
-headers for a download. C<%params> can include the following:
+C<%params> can include the following:

 
 =over 2
 
 
 =over 2
 


@@ -471,7 +510,11 @@ headers for a download. C<%params> can include the following:
 'application/octet_stream'
 
 =item * C<name> -- the name presented to the browser; defaults to
 'application/octet_stream'
 
 =item * C<name> -- the name presented to the browser; defaults to

-C<$file_name>
+C<$file_name>; mandatory if C<$file_name_or_content> is a reference
+
+=item * C<unlink> -- if trueish and C<$file_name_or_content> refers to
+a file name then unlink the file after it has been sent to the browser
+(e.g. for temporary files)

 
 =back
 
 
 =back
 


@@ -495,6 +538,9 @@ L</controller_name>.
 The action to call is given by C<$params{action}>. It defaults to
 C<dispatch>.
 
 The action to call is given by C<$params{action}>. It defaults to
 C<dispatch>.
 

+If C<$params{fragment}> is present, it's used as the fragment of the resulting
+URL.
+

 All other key/value pairs in C<%params> are appended as GET parameters
 to the URL.
 
 All other key/value pairs in C<%params> are appended as GET parameters
 to the URL.
 


@@ -562,13 +608,16 @@ C<user> (authentication as a normal user suffices) with a possible
 future value C<none> (which would require no authentication but is not
 yet implemented).
 
 future value C<none> (which would require no authentication but is not
 yet implemented).
 

-=item C<keep_auth_vars_in_form>
+=item C<keep_auth_vars_in_form %params>

 
 May be overridden by a controller. If falsish (the default) all form
 variables whose name starts with C<{AUTH}> are removed before the
 request is routed. Only controllers that handle login requests
 themselves should return trueish for this function.
 
 
 May be overridden by a controller. If falsish (the default) all form
 variables whose name starts with C<{AUTH}> are removed before the
 request is routed. Only controllers that handle login requests
 themselves should return trueish for this function.
 

+C<$params{action}> contains the action name that the request will be
+dispatched to.
+

 =item C<controller_name>
 
 Returns the name of the curernt controller package without the
 =item C<controller_name>
 
 Returns the name of the curernt controller package without the


@@ -586,6 +635,10 @@ name the dispatching resolved to.
 Returns the global presenter object by calling
 L<SL::Presenter/get>.
 
 Returns the global presenter object by calling
 L<SL::Presenter/get>.
 

+=item C<js>
+
+Returns an L<SL::ClientJS> instance for this controller.
+

 =back
 
 =head2 PRIVATE FUNCTIONS
 =back
 
 =head2 PRIVATE FUNCTIONS