From 5652b93ef5183aea68b2e70c23c576017daf25dd Mon Sep 17 00:00:00 2001 From: Martin Persson Date: Fri, 9 Oct 2015 14:24:35 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 14994 - Request proxy (added syspref) Adds a web proxy allowing external RSS and Atom feeds to be displayed in OPAC and staff interface pages. This patch adds system preference(s) under the 'Web services' tabs. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard --- installer/data/mysql/atomicupdate/bug_14994-proxy.sql | 1 + installer/data/mysql/sysprefs.sql | 2 ++ .../prog/en/modules/admin/preferences/web_services.pref | 14 ++++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_14994-proxy.sql diff --git a/installer/data/mysql/atomicupdate/bug_14994-proxy.sql b/installer/data/mysql/atomicupdate/bug_14994-proxy.sql new file mode 100644 index 0000000..320a120 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_14994-proxy.sql @@ -0,0 +1 @@ +INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES ('RequestProxyEnabled','0',NULL,'Enables or disables the web request proxy in Koha','YesNo'), ('RequestProxyURL', '', NULL, 'External URL(s) for proxy requests.', 'Free'); diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 64aa493..825b9b8 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -441,6 +441,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('ReplyToDefault','',NULL,'Use this email address as the replyto in emails','Free'), ('ReportsLog','0',NULL,'If ON, log information about reports.','YesNo'), ('RequestOnOpac','1',NULL,'If ON, globally enables patron holds on OPAC','YesNo'), +('RequestProxyEnabled','0',NULL,'Enables or disables the web request proxy in Koha','YesNo'), +('RequestProxyURL', '', NULL, 'External URL(s) for proxy requests.', 'Free'), ('ReservesControlBranch','PatronLibrary','ItemHomeLibrary|PatronLibrary','Branch checked for members reservations rights','Choice'), ('ReservesMaxPickUpDelay','7','','Define the Maximum delay to pick up an item on hold','Integer'), ('ReservesNeedReturns','1','','If ON, a hold placed on an item available in this library must be checked-in, otherwise, a hold on a specific item, that is in the library & available is considered available','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref index b52fdc6..a2a7215 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref @@ -53,6 +53,20 @@ Web services: - pref: SvcMaxReportRows class: integer - rows of a report requested via the reports web service. + Request proxy: + - + - pref: RequestProxyEnabled + choices: + yes: Enable + no: Disable + default: 0 + - the internal HTTP request proxy in Koha. Used to pull data from external sources from browser. + - + - pref: RequestProxyURL + type: textarea + class: code + - This is a list of URLs for the request proxy, one on each line. + - The first URL will have id 1, the next 2 and so on. IdRef: - - pref: IdRef -- 2.1.4