Attachment 36210 Details for Bug 6874 – Bug 6874 - Clean up file URL generation

[patch] Bug 6874 - Clean up file URL generation

Bug-6874---Clean-up-file-URL-generation.patch (text/plain), 3.63 KB, created by Mark Tompsett on 2015-02-26 20:26:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2015-02-26 20:26:31 UTC

Size: 3.63 KB

patch

obsolete

>From 24c3d447c33bc1080b85272caaa11aa60fb73d15 Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Wed, 16 Apr 2014 00:23:40 -0400
>Subject: [PATCH] Bug 6874 - Clean up file URL generation
>
>This adds a dependency on bug 5010, particularly the OPAC
>system preference: OpacProtocol. This is used to generate the
>http or https for the OPACBaseURL. This now checks for proper
>configuration of the system preference.
>---
> cataloguing/value_builder/upload.pl                          | 12 ++++++++----
> .../prog/en/modules/cataloguing/value_builder/upload.tt      |  7 +++++--
> .../modules/cataloguing/value_builder/upload_delete_file.tt  |  7 +++++--
> 3 files changed, 18 insertions(+), 8 deletions(-)
>
>diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl
>index 211a588..a3ad2d3 100755
>--- a/cataloguing/value_builder/upload.pl
>+++ b/cataloguing/value_builder/upload.pl
>@@ -100,10 +100,14 @@ sub plugin {
>         my $fh = $input->upload('uploaded_file');
> 
>         $id = C4::UploadedFiles::UploadFile($uploaded_file, $dir, $fh->handle);
>-        if($id) {
>-            my $OPACBaseURL = C4::Context->preference('OPACBaseURL');
>-            $OPACBaseURL =~ s#/$##;
>-            my $return = "$OPACBaseURL/cgi-bin/koha/opac-retrieve-file.pl?id=$id";
>+        my $OPACBaseURL = C4::Context->preference('OPACBaseURL') // '';
>+        $OPACBaseURL =~ s#/$##;
>+        if (!$OPACBaseURL) {
>+            $template->param(MissingURL => 1);
>+        }
>+        if($id && $OPACBaseURL) {
>+            my $OpacProtocol = C4::Context->preference('OpacProtocol') // 'http://';
>+            my $return = "$OpacProtocol$OPACBaseURL/cgi-bin/koha/opac-retrieve-file.pl?id=$id";
>             $template->param(
>                 success => 1,
>                 return => $return,
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>index 2f002af..e08e424 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>@@ -56,9 +56,12 @@
> 
> [% ELSE %]
> 
>-    [% IF ( error ) %]
>+    [% IF ( MissingURL ) %]
>+        <p>Error: The OPAC system preference OPACBaseURL is not configured.</p>
>+        <p><input type="button" value="close" onclick="window.close();" /></p>
>+    [% ELSIF ( error ) %]
>         <p>Error: Failed to upload file. See logs for details.</p>
>-        <input type="button" value="close" onclick="window.close();" />
>+        <p><input type="button" value="close" onclick="window.close();" /></p>
>     [% ELSE %]
>         [%# This block display recursively a directory tree in variable 'dirs' %]
>         [% BLOCK list_dirs %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
>index 928b954..7f5e05d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload_delete_file.tt
>@@ -38,8 +38,11 @@
> 
> [% ELSE %]
> 
>-    [% IF ( error ) %]
>-        Error: Unable to delete the file.
>+    [% IF ( MissingURL ) %]
>+        <p>Error: The OPAC system preference OPACBaseURL is not configured.</p>
>+        <p><input type="button" value="close" onclick="window.close();" /></p>
>+    [% ELSIF ( error ) %]
>+        <p>Error: Unable to delete the file.</p>
>         <p><input type="button" value="close" onclick="window.close();" /></p>
>     [% ELSE %]
>         <h2>File deletion</h2>
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 6874: 5439 | 5440 | 5764 | 7114 | 7980 | 8234 | 8468 | 10664 | 10673 | 10863 | 10982 | 11098 | 11634 | 12355 | 12356 | 12357 | 12358 | 14130 | 14131 | 14132 | 14133 | 16343 | 16354 | 16355 | 16356 | 16357 | 16370 | 16693 | 16694 | 16695 | 16696 | 16697 | 16698 | 16699 | 16712 | 16713 | 16714 | 16715 | 16716 | 16717 | 16718 | 16719 | 17368 | 17369 | 18767 | 18768 | 18769 | 18770 | 18771 | 18772 | 18773 | 18774 | 18775 | 18776 | 18777 | 18891 | 18892 | 18893 | 18894 | 20059 | 20060 | 20779 | 21432 | 21433 | 21434 | 21435 | 21436 | 21489 | 21543 | 21546 | 21635 | 21798 | 21799 | 21800 | 21801 | 21802 | 21803 | 23588 | 23589 | 23590 | 23591 | 23607 | 23608 | 23609 | 23610 | 23611 | 23612 | 23613 | 26418 | 26419 | 26420 | 26421 | 26422 | 26423 | 26424 | 26878 | 26879 | 26880 | 26881 | 26882 | 26883 | 26884 | 27114 | 27125 | 27154 | 27155 | 27225 | 30362 | 30363 | 30364 | 30365 | 30366 | 30367 | 30368 | 30369 | 30370 | 30371 | 32384 | 32385 | 32386 | 32387 | 32388 | 32389 | 32390 | 32391 | 32392 | 32393 | 36198 | 36199 | 36200 | 36201 | 36202 | 36203 | 36204 | 36205 | 36206 | 36207 | 36208 | 36209 | 36210 | 36211 | 36213 | 36214 | 36215 | 36216 | 36217 | 36218 | 36219 | 36220 | 36221 | 36222 | 36223 | 36224 | 36225 | 36226 | 36227 | 36228 | 36229 | 36230 | 36231 | 36232 | 37681 | 37682 | 37683 | 37684 | 37685 | 37686 | 37687 | 37688 | 37689 | 37690 | 37691 | 37692 | 37693 | 37694 | 37696 | 37697 | 37698 | 37699 | 37700 | 37701 | 37702 | 37703 | 37704 | 37705 | 37706 | 38911 | 38912 | 38913 | 38914 | 38915 | 38916 | 38917 | 38918 | 38919 | 38920 | 38921 | 38922 | 38923 | 38924 | 38925 | 38926 | 38927 | 38928 | 38929 | 38930 | 38931 | 38932 | 38933 | 38934 | 38935 | 38936 | 39113 | 39114 | 39115 | 39116 | 39117 | 39118 | 39119 | 39120 | 39121 | 39122 | 39123 | 39626 | 39627 | 39628 | 39629 | 39630 | 39631 | 39632 | 39633 | 39634 | 39635 | 39636 | 39637 | 39638 | 41275 | 41276 | 41277 | 41278 | 41279 | 41280 | 41281 | 41282 | 41283 | 41284 | 41285 | 41286 | 41287 | 41288 | 41448 | 41449 | 41450 | 41783