From 09a37565b9427a06ab954f7a298a93bfd7ce9309 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 18 Apr 2015 17:36:27 -0400 Subject: [PATCH] Bug 9254: redirect to 404 if at least 1 pref is off And set the default value of EnhancedMessagingPreferencesOPAC = EnhancedMessagingPreferences --- ...Add-OPACEnhancedMessagingPreferences-system-preference.sql | 11 ++++++----- opac/opac-messaging.pl | 6 ++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql b/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql index 85adb7d..35f01bf 100644 --- a/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql +++ b/installer/data/mysql/atomicupdate/Bug-9254-Add-OPACEnhancedMessagingPreferences-system-preference.sql @@ -1,6 +1,7 @@ INSERT INTO systempreferences - (variable,value,explanation,options,type) -VALUES - ('EnhancedMessagingPreferencesOPAC',1, - 'Show the patrons messaging preferences page in the OPAC', - NULL, 'YesNo'); + (variable,value,explanation,options,type) +SELECT 'EnhancedMessagingPreferencesOPAC', value, + 'Show the patrons messaging preferences page in the OPAC', + NULL, 'YesNo' +FROM systempreferences +WHERE variable='EnhancedMessagingPreferences'; diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl index 3e55c57..3cd3562 100755 --- a/opac/opac-messaging.pl +++ b/opac/opac-messaging.pl @@ -35,6 +35,12 @@ use C4::Form::MessagingPreferences; my $query = CGI->new(); +unless ( C4::Context->preference('EnhancedMessagingPreferencesOPAC') and + C4::Context->preference('EnhancedMessagingPreferences') ) { + print $query->redirect("/cgi-bin/koha/errors/404.pl"); + exit; +} + my ( $template, $borrowernumber, $cookie ) = get_template_and_user( { template_name => 'opac-messaging.tt', -- 1.9.1