Bug 25444: Simplify the code using a loop

[koha-ffzg.git] / C4 / Output.pm

diff --git a/C4/Output.pm b/C4/Output.pm
index af7dd5a..921c3a4 100644 (file)
--- a/C4/Output.pm
+++ b/C4/Output.pm
@@ -25,11 +25,12 @@ package C4::Output;
 # NOTE: I'm pretty sure this module is deprecated in favor of
 # templates.
 
-use strict;
-#use warnings; FIXME - Bug 2505
+use Modern::Perl;
 
 use URI::Escape;
+use Scalar::Util qw( looks_like_number );
 
+use C4::Auth qw(get_template_and_user);
 use C4::Context;
 use C4::Templates;
 
@@ -50,6 +51,7 @@ BEGIN {
     );
     push @EXPORT, qw(
         &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
+        &output_and_exit_if_error &output_and_exit &output_error
     );
 
 }
@@ -61,7 +63,6 @@ C4::Output - Functions for managing output, is slowly being deprecated
 =head1 FUNCTIONS
 
 =over 2
-=cut
 
 =item pagination_bar
 
@@ -89,6 +90,9 @@ sub pagination_bar {
     my $startfrom_name = (@_) ? shift : 'page';
     my $additional_parameters = shift || {};
 
+    $current_page = looks_like_number($current_page) ? $current_page : undef;
+    $nb_pages     = looks_like_number($nb_pages)     ? $nb_pages     : undef;
+
     # how many pages to show before and after the current page?
     my $pages_around = 2;
 
@@ -106,7 +110,7 @@ sub pagination_bar {
     my $url = $base_url . (($base_url =~ m/$delim/ or $base_url =~ m/\?/) ? '&' : '?' ) . $startfrom_name . '=';
     my $url_suffix;
     while ( my ( $k, $v ) = each %$additional_parameters ) {
-        $url_suffix .= '&' . $k . '=' . $v;
+        $url_suffix .= '&' . URI::Escape::uri_escape_utf8($k) . '=' . URI::Escape::uri_escape_utf8($v);
     }
     my $pagination_bar = '';
 
@@ -270,6 +274,8 @@ sub output_with_http_headers {
         'X-Frame-Options' => 'SAMEORIGIN',
     };
     $options->{expires} = 'now' if $extra_options->{force_no_caching};
+    $options->{'Access-Control-Allow-Origin'} = C4::Context->preference('AccessControlAllowOrigin')
+        if C4::Context->preference('AccessControlAllowOrigin');
 
     $options->{cookie} = $cookie if $cookie;
     if ($content_type eq 'html') {  # guaranteed to be one of the content_type_map keys, else we'd have died
@@ -306,15 +312,88 @@ sub is_ajax {
     return ( $x_req and $x_req =~ /XMLHttpRequest/i ) ? 1 : 0;
 }
 
+=item output_and_exit_if_error
+
+    output_and_exit_if_error( $query, $cookie, $template, $params );
+
+To executed at the beginning of scripts to stop the script at this point if
+some errors are found.
+
+Tests for module 'members':
+* patron is not defined (we are looking for a patron that does no longer exist/never existed)
+* The logged in user cannot see patron's infos (feature 'cannot_see_patron_infos')
+
+Others will be added here depending on the needs (for instance biblio does not exist will be useful).
+
+=cut
+
+sub output_and_exit_if_error {
+    my ( $query, $cookie, $template, $params ) = @_;
+    my $error;
+    if ( $params and exists $params->{module} ) {
+        if ( $params->{module} eq 'members' ) {
+            my $logged_in_user = $params->{logged_in_user};
+            my $current_patron = $params->{current_patron};
+            if ( not $current_patron ) {
+                $error = 'unknown_patron';
+            }
+            elsif( not $logged_in_user->can_see_patron_infos( $current_patron ) ) {
+                $error = 'cannot_see_patron_infos';
+            }
+        } elsif ( $params->{module} eq 'cataloguing' ) {
+            # We are testing the record to avoid additem to fetch the Koha::Biblio
+            # But in the long term we will want to get a biblio in parameter
+            $error = 'unknown_biblio' unless $params->{record};
+        }
+    }
+
+    output_and_exit( $query, $cookie, $template, $error ) if $error;
+    return;
+}
+
+=item output_and_exit
+
+    output_and_exit( $query, $cookie, $template, $error );
+
+    $error is a blocking error like biblionumber not found or so.
+    We should output the error and exit.
+
+=cut
+
+sub output_and_exit {
+    my ( $query, $cookie, $template, $error ) = @_;
+    $template->param( blocking_error => $error );
+    output_html_with_http_headers ( $query, $cookie, $template->output );
+    exit;
+}
+
+sub output_error {
+    my ( $query, $error ) = @_;
+    my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+        {
+            template_name   => 'errors/errorpage.tt',
+            query           => $query,
+            type            => 'intranet',
+            authnotrequired => 1,
+        }
+    );
+    my $admin = C4::Context->preference('KohaAdminEmailAddress');
+    $template->param (
+        admin => $admin,
+        errno => $error,
+    );
+    output_with_http_headers $query, $cookie, $template->output, 'html', '404 Not Found';
+}
+
 sub parametrized_url {
     my $url = shift || ''; # ie page.pl?ln={LANG}
     my $vars = shift || {}; # ie { LANG => en }
     my $ret = $url;
     while ( my ($key,$val) = each %$vars) {
-        my $val_url = URI::Escape::uri_escape_utf8($val);
+        my $val_url = URI::Escape::uri_escape_utf8( $val // q{} );
         $ret =~ s/\{$key\}/$val_url/g;
     }
-    $ret =~ s/\{[^\{]*\}//g; # remove not defined vars
+    $ret =~ s/\{[^\{]*\}//g; # remove remaining vars
     return $ret;
 }