From 43fadbadea9a4504e519dfb0b915e57fd811e0ad Mon Sep 17 00:00:00 2001 From: Simith D'Oliveira Date: Fri, 19 Dec 2014 14:44:48 -0500 Subject: [PATCH] Bug 13485: Add a page to display links to restricted sites To test: I) Apply the patch II) Run updatedatabase.pl scenario I) 1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs. 2) Add your machine ip (ex. 127.0.0) 3) Validate cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents. scenario II) 1) Logout opac page 2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs. 3) Add other ip that your machine ip. 4) Validate: cgi-bin/koha/opac-proxypage.pl shows a login page. 5) Validate: cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login. Followed both scenarios, works as expected. Signed-off-by: Marc Veron Signed-off-by: Kyle M Hall Bug 13485 [QA Followup] Signed-off-by: Kyle M Hall Bug 13485 - Atomic Update + Rename Proxy page to Restricted page Test plan: I) Apply the patch II) Run updatedatabase.pl scenario I) 1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs. 2) Add your machine ip (ex. 127.0.0) 3) Validate cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents. scenario II) 1) Logout opac page 2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs. 3) Add a diffrent ip. 4) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a login page. 5) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login. new file: installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql modified: installer/data/mysql/sysprefs.sql modified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref renamed: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-proxypage.tt -> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt renamed: opac/opac-proxypage.pl -> opac/opac-restrictedpage.pl Signed-off-by: Jonathan Druart Signed-off-by: Tomas Cohen Arazi --- .../atomicupdate/Bug13485_RestrictedSitesPage.sql | 4 ++ installer/data/mysql/sysprefs.sql | 3 ++ .../prog/en/modules/admin/preferences/opac.pref | 15 ++++++ .../bootstrap/en/modules/opac-restrictedpage.tt | 50 ++++++++++++++++++++ opac/opac-restrictedpage.pl | 53 ++++++++++++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt create mode 100755 opac/opac-restrictedpage.pl diff --git a/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql b/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql new file mode 100644 index 0000000000..64192c782f --- /dev/null +++ b/installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql @@ -0,0 +1,4 @@ +INSERT INTO systempreferences (variable,value,options,explanation,type) +VALUES ('RestrictedPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: \"127.0.0,127.0.2\")','Free'), +('RestrictedPageContent','',NULL,'HTML content of the restricted page','TextArea'), +('RestrictedPageTitle','',NULL,'Title of the restricted page (breadcrumb and header)','Free') diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 3c7bcc0a17..ac79f44219 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -365,6 +365,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('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'), +('RestrictedPageLocalIPs','',NULL,'Beginning of IP addresses considered as local (comma separated ex: "127.0.0,127.0.2")','Free'), +('RestrictedPageContent','',NULL,'HTML content of the restricted page','TextArea'), +('RestrictedPageTitle','',NULL,'Title of the restricted page (breadcrumb and header)','Free'), ('ReturnBeforeExpiry','0',NULL,'If ON, checkout will be prevented if returndate is after patron card expiry','YesNo'), ('ReturnLog','1',NULL,'If ON, enables the circulation (returns) log','YesNo'), ('ReturnToShelvingCart','0','','If set, when any item is \'checked in\', it\'s location code will be changed to CART.','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index ad0f26fd90..2fd6867c40 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -601,6 +601,21 @@ OPAC: track: "Track" no: "Don't track" - links that patrons click on + Restricted page: + - + - "Access from IP addresses beginning with" + - pref: RestrictedPageLocalIPs + - "do not need to be authenticated (comma separated - ex: '127.0.0,127.0.1')" + - + - "HTML content of your restricted page" + - pref: RestrictedPageContent + type: textarea + class: HTML + - + - Use + - pref: RestrictedPageTitle + class: long + - "as title of your restricted page (appears in the breadcrumb and on the top of the restricted page)" Shelf Browser: - diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt new file mode 100644 index 0000000000..ac6765d557 --- /dev/null +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt @@ -0,0 +1,50 @@ +[% USE Koha %] +[% USE KohaDates %] + +[% INCLUDE 'doc-head-open.inc' %] + + [% IF ( LibraryNameTitle ) %] + [% LibraryNameTitle %] + [% ELSE %] + Koha online + [% END %] + catalog + [% IF RestrictedPageTitle %] + › [% RestrictedPageTitle %] + [% END %] + +[% INCLUDE 'doc-head-close.inc' %] +[% BLOCK cssinclude %][% END %] + + +[% INCLUDE 'masthead.inc' %] + +
+
    +
  • Home
    • + [% IF ( RestrictedPageTitle ) %] +
  • › [% RestrictedPageTitle %]
    • + [% END %] +
+ +
+
+
+ +
+
+
+ [% IF ( RestrictedPageTitle ) %] +

[% RestrictedPageTitle %]

+ [% END %] + [% RestrictedPageContent %] +
+
+
+
+
+ +[% INCLUDE 'opac-bottom.inc' %] +[% BLOCK jsinclude %][% END %] diff --git a/opac/opac-restrictedpage.pl b/opac/opac-restrictedpage.pl new file mode 100755 index 0000000000..684b129b48 --- /dev/null +++ b/opac/opac-restrictedpage.pl @@ -0,0 +1,53 @@ +#!/usr/bin/perl + +# Copyright Solutions inLibro inc 2014 +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version . +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +use Modern::Perl; + +use CGI; +use C4::Auth; +use C4::Output; + +my $localNetwork = C4::Context->preference('RestrictedPageLocalIPs'); +my $userIP = $ENV{'REMOTE_ADDR'}; + +my $withinNetwork = 0; +foreach my $IPRange ( split( ',', $localNetwork ) ) +{ + $withinNetwork = ( $userIP =~ /^$IPRange/ ); + last if $withinNetwork; +} + +my $query = new CGI; +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "opac-restrictedpage.tt", + query => $query, + type => "opac", + authnotrequired => $withinNetwork, + flagsrequired => { borrow => 1 }, + debug => 1, + } +); + +$template->param( + RestrictedPageContent => C4::Context->preference('RestrictedPageContent'), + RestrictedPageTitle => C4::Context->preference('RestrictedPageTitle') + ); + +output_html_with_http_headers $query, $cookie, $template->output; -- 2.11.4.GIT