diff --git a/C4/Auth.pm b/C4/Auth.pm index adc1b5dd0d..ba074bab46 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -193,7 +193,7 @@ sub get_template_and_user { # Exceptions for consent page itself and SCI/SCO system if( $in->{type} eq 'opac' && $user && $in->{'template_name'} !~ /^(opac-page|opac-patron-consent|sc[io]\/)/ && - C4::Context->preference('GDPR_Policy') eq 'Enforced' ) + C4::Context->preference('PrivacyPolicyConsent') eq 'Enforced' ) { my $consent = Koha::Patron::Consents->search({ borrowernumber => getborrowernumber($user), diff --git a/installer/data/mysql/atomicupdate/bug_33179_rename_gdpr_policy.pl b/installer/data/mysql/atomicupdate/bug_33179_rename_gdpr_policy.pl new file mode 100755 index 0000000000..811a161bf4 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_33179_rename_gdpr_policy.pl @@ -0,0 +1,12 @@ +use Modern::Perl; + +return { + bug_number => "33197", + description => "Rename GDPR_Policy system preference", + up => sub { + my ($args) = @_; + my ($dbh, $out) = @$args{qw(dbh out)}; + $dbh->do(q{UPDATE systempreferences set variable = "PrivacyPolicyConsent" WHERE variable = "GDPR_Policy"}); + say $out "Rename system preference GDPR_Policy to PrivacyPolicyConsent"; + }, +}; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index f8fd314f2c..ccedbf901e 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -254,7 +254,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('FinesLog','1',NULL,'If ON, log fines','YesNo'), ('finesMode','off','off|production','Choose the fines mode, \'off\' (no charges), \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'), ('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'), -('GDPR_Policy','','Enforced|Permissive|Disabled','General Data Protection Regulation - policy', 'Choice'), ('GenerateAuthorityField667', 'Machine generated authority record', NULL, 'When BiblioAddsAuthorities and AutoCreateAuthorities are enabled, use this as a default value for the 667$a field of MARC21 records', 'free'), ('GenerateAuthorityField670', 'Work cat.', NULL, 'When BiblioAddsAuthorities and AutoCreateAuthorities are enabled, use this as a default value for the 670$a field of MARC21 records', 'free'), ('GoogleJackets','0',NULL,'if ON, displays jacket covers from Google Books API','YesNo'), @@ -578,6 +577,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('PreserveSerialNotes','1','','When a new "Expected" issue is generated, should it be prefilled with last created issue notes?','YesNo'), ('previousIssuesDefaultSortOrder','asc','asc|desc','Specify the sort order of Previous Issues on the circulation page','Choice'), ('PrintNoticesMaxLines','0','','If greater than 0, sets the maximum number of lines an overdue notice will print. If the number of items is greater than this number, the notice will end with a warning asking the borrower to check their online account for a full list of overdue items.','Integer'), +('PrivacyPolicyConsent','','Enforced|Permissive|Disabled','Data privacy policy consent in the OPAC', 'Choice'), ('PrivacyPolicyURL','',NULL,'This URL is used in messages about GDPR consents.', 'Free'), ('ProcessingFeeNote', '', NULL, 'Set the text to be recorded in the column note, table accountlines when the processing fee (defined in item type) is applied', 'textarea'), ('ProtectSuperlibrarianPrivileges','1',NULL,'If enabled, non-superlibrarians cannot set superlibrarian privileges','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 01c75a22bf..e477ae0b39 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -355,16 +355,16 @@ Patrons: - Use the following URL - pref: PrivacyPolicyURL class: url - - to refer to your local privacy policy in messages about privacy and data protection. (If you enforce GDPR policy, make sure that this page is not blocked.) - - '
NOTE: The URL will only be displayed if GDPR_Policy is set.' + - to refer to your local privacy policy in messages about privacy and data protection. (If you enforce a data privacy policy, make sure that this page is not blocked.) + - '
NOTE: The URL will only be displayed if PrivacyPolicyConsent is set.' - - - "Set GDPR policy to:" - - pref: GDPR_Policy + - "Set data privacy policy consent to:" + - pref: PrivacyPolicyConsent choices: '': 'disabled' Enforced: 'enforced' Permissive: 'permissive' - - ". GDPR is the EU General Data Protection Regulation. When you enforce, patrons need to give consent before using the OPAC. If you set to permissive, Koha will warn but not enforce." + - ". When you enforce a data privacy policy, patrons need to give consent before using the OPAC. If you set to permissive, Koha will warn but not enforce." - '
NOTE: If you enable this you will also have to set the URL of your public privacy policy with the PrivacyPolicyURL setting.' - - Lock/expire patrons that submitted an unsubscribe request (refused consent) after diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc index c8bd1669ab..5f8b48cda8 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/usermenu.inc @@ -24,7 +24,7 @@ [% END %] Personal details - [% IF Koha.Preference('GDPR_Policy') # remove when extending %] + [% IF Koha.Preference('PrivacyPolicyConsent') # remove when extending %] [% IF consentview %]
  • [% ELSE %]
  • [% END %] Consents
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt index a21d631d5a..cacaaf671e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-memberentry.tt @@ -1004,11 +1004,11 @@ [% END %] - [% IF Koha.Preference('GDPR_Policy') && action != 'edit' %] + [% IF Koha.Preference('PrivacyPolicyConsent') && action != 'edit' %]