Jonathan Druart
286be46e8a
The C4::Members::GetBorrowersWithIssuesHistoryOlderThan subroutine is supposed to return the patrons with an issue history older than a given date. It would make more sense to return a list of Koha::Patrons. On the way, the code from AnonymiseIssueHistory will be moved as well to anonymise_issue_history. Note that these 2 subroutines are strongly linked: one is used to know the number of patrons we will anonymise the history, the other one is used to anonymise the issues history. The problem is that the first one is not used to do the action, but only for displayed purpose. In some cases, these 2 values can differ, which could be confusing. Case 1: The logged in librarian is not superlibrarian and IndependentBranches is set: if 2+ patrons from different libraries match the date parameter, the interface will display "Checkout history for 2 patrons will be anonymized", when actually only 1 will be. Case 2: If 2+ patrons match the date parameter but one of them has his privacy set to forever (privacy=0), the same issue will appear. This patch moves the code from C4::Members::GetBorrowersWithIssuesHistoryOlderThan to Koha::Patrons->search_patrons_to_anonymise and from C4::Circulation::AnonymiseIssueHistory to Koha::Patrons->anonymise_issue_history Test plan: 1/ Confirm the 2 issues and make sure they are fixed using the Batch patron anonymization tool (tools/cleanborrowers.pl) 2/ At the OPAC, use the 'Immediate deletion' button to delete all your reading history (regardless the setting of the privacy rule) 3/ Use the cronjob script (misc/cronjobs/batch_anonymise.pl) to anonymise patrons. Signed-off-by: Josef Moravec <josef.moravec@gmail.com> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
84 lines
2.7 KiB
Perl
Executable file
84 lines
2.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# This script lets the users change their privacy rules
|
|
#
|
|
# copyright 2009, BibLibre, paul.poulain@biblibre.com
|
|
#
|
|
# 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, see <http://www.gnu.org/licenses>.
|
|
|
|
use strict;
|
|
use CGI qw ( -utf8 );
|
|
|
|
use C4::Auth; # checkauth, getborrowernumber.
|
|
use C4::Context;
|
|
use C4::Members;
|
|
use C4::Output;
|
|
use Koha::Patrons;
|
|
|
|
my $query = new CGI;
|
|
|
|
# if OPACPrivacy is disabled, leave immediately
|
|
if ( ! C4::Context->preference('OPACPrivacy') || ! C4::Context->preference('opacreadinghistory') ) {
|
|
print $query->redirect("/cgi-bin/koha/errors/404.pl");
|
|
exit;
|
|
}
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "opac-privacy.tt",
|
|
query => $query,
|
|
type => "opac",
|
|
authnotrequired => 0,
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $op = $query->param("op");
|
|
my $privacy = $query->param("privacy");
|
|
my $privacy_guarantor_checkouts = $query->param("privacy_guarantor_checkouts");
|
|
|
|
if ( $op eq "update_privacy" ) {
|
|
ModMember(
|
|
borrowernumber => $borrowernumber,
|
|
privacy => $privacy,
|
|
privacy_guarantor_checkouts => $privacy_guarantor_checkouts,
|
|
);
|
|
$template->param( 'privacy_updated' => 1 );
|
|
}
|
|
elsif ( $op eq "delete_record" ) {
|
|
|
|
# delete all reading records for items returned
|
|
# uses a hardcoded date ridiculously far in the future
|
|
|
|
my $rows = eval {
|
|
Koha::Patrons->search({ 'me.borrowernumber' => $borrowernumber })->anonymise_issue_history( '2999-12-12' );
|
|
};
|
|
$rows = $@ ? 0 : int($rows);
|
|
$template->param( 'deleted' => $rows );
|
|
}
|
|
|
|
# get borrower privacy ....
|
|
my $borrower = Koha::Patrons->find( $borrowernumber );;
|
|
|
|
$template->param(
|
|
'Ask_data' => 1,
|
|
'privacy' . $borrower->privacy() => 1,
|
|
'privacyview' => 1,
|
|
'borrower' => $borrower,
|
|
'surname' => $borrower->surname,
|
|
'firstname' => $borrower->firstname,
|
|
);
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
|