Attachment 157817 Details for Bug 25672 – Bug 25672: Fix double output_html_with_http_headers

[patch] Bug 25672: Fix double output_html_with_http_headers

Bug-25672-Fix-double-outputhtmlwithhttpheaders.patch (text/plain), 2.23 KB, created by Kyle M Hall (khall) on 2023-10-25 15:28:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2023-10-25 15:28:35 UTC

Size: 2.23 KB

patch

obsolete

>From e717426bafe971b086137b6ab461839aabcfb769 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Tue, 24 Oct 2023 10:49:44 +0100
>Subject: [PATCH] Bug 25672: Fix double output_html_with_http_headers
>
>We weren't exiting after calling output_html_with_http_headers and so we
>were ending up with a double template render (and also a subsequent
>confusion in the cookie consent code).
>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> plugins/plugins-upload.pl | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl
>index dff5a7536a7..02fd2548c76 100755
>--- a/plugins/plugins-upload.pl
>+++ b/plugins/plugins-upload.pl
>@@ -35,24 +35,27 @@ my $plugins_enabled    = C4::Context->config("enable_plugins");
> my $plugins_restricted = C4::Context->config("plugins_restricted");
> 
> my $input = CGI->new;
>+my $uploadlocation = $input->param('uploadlocation');
> 
> my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
>     {
>-        template_name => $plugins_enabled ? "plugins/plugins-upload.tt" : "plugins/plugins-disabled.tt",
>+        template_name => ( !$plugins_enabled || $plugins_restricted && !$uploadlocation )
>+        ? 'plugins/plugins-disabled.tt'
>+        : 'plugins/plugins-upload.tt',
>         query         => $input,
>         type          => "intranet",
>         flagsrequired => { plugins => 'manage' },
>     }
> );
> 
>-my $uploadlocation = $input->param('uploadlocation');
>-
>-# Early exists if uploads are not enabled direct upload attempted when uploads are restricted
>+# Early exist if uploads are not enabled direct upload attempted when uploads are restricted
> if (!$plugins_enabled) {
>     output_html_with_http_headers $input, $cookie, $template->output;
>+    exit;
> } elsif ( $plugins_restricted && !$uploadlocation ) {
>     $template->param( plugins_restricted => $plugins_restricted );
>     output_html_with_http_headers $input, $cookie, $template->output;
>+    exit;
> }
> 
> my $uploadfilename = $input->param('uploadfile');
>@@ -132,3 +135,5 @@ if ( ( $uploadfile || $uploadlocation ) && !%errors && !$template->param('ERRORS
> } else {
>     output_html_with_http_headers $input, $cookie, $template->output;
> }
>+
>+exit;
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 25672: 106651 | 106671 | 106673 | 106674 | 107172 | 107173 | 107174 | 153824 | 153825 | 153826 | 153827 | 153925 | 154423 | 154424 | 154425 | 154426 | 154427 | 154453 | 154455 | 154464 | 154465 | 154466 | 154467 | 154468 | 154474 | 154475 | 154476 | 154477 | 154478 | 156715 | 156716 | 156717 | 156718 | 156719 | 156720 | 156734 | 156735 | 156736 | 156737 | 156738 | 156739 | 156740 | 157730 | 157810 | 157811 | 157812 | 157813 | 157814 | 157815 | 157816 | 157817 | 157836 | 157837 | 157838 | 157839 | 157840 | 157841 | 157842 | 157843 | 157846 | 157847 | 157848 | 157849 | 157850 | 157851 | 157852 | 157853