my $prefEasyAnalyticalRecords = C4::Context->preference('EasyAnalyticalRecords');
my $prefUseControlNumber = C4::Context->preference('UseControlNumber');
my $warnPrefEasyAnalyticalRecords = ( $prefEasyAnalyticalRecords && $prefUseControlNumber );
-my $warnPrefAnonymousPatron = (
+
+my $AnonymousPatron = C4::Context->preference('AnonymousPatron');
+my $warnPrefAnonymousPatronOPACPrivacy = (
C4::Context->preference('OPACPrivacy')
- and not C4::Context->preference('AnonymousPatron')
+ and not $AnonymousPatron
+);
+my $warnPrefAnonymousPatronAnonSuggestions = (
+ C4::Context->preference('AnonSuggestions')
+ and not $AnonymousPatron
);
-my $anonymous_patron = Koha::Patrons->find( C4::Context->preference('AnonymousPatron') );
-my $warnPrefAnonymousPatron_PatronDoesNotExist = ( not $anonymous_patron and Koha::Patrons->search({ privacy => 2 })->count );
+my $anonymous_patron = Koha::Patrons->find( $AnonymousPatron );
+my $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist = ( $AnonymousPatron && C4::Context->preference('AnonSuggestions') && not $anonymous_patron );
+
+my $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist = ( not $anonymous_patron and Koha::Patrons->search({ privacy => 2 })->count );
my $errZebraConnection = C4::Context->Zconn("biblioserver",0)->errcode();
$bad_relationships_count = $bad_relationships_count->[0]->[0];
- my @existing_relationships = $dbh->selectall_arrayref(q{
+ my $existing_relationships = $dbh->selectall_arrayref(q{
SELECT DISTINCT(relationship)
FROM (
SELECT relationship FROM borrower_relationships WHERE relationship IS NOT NULL
my %valid_relationships = map { $_ => 1 } split( /,|\|/, C4::Context->preference('borrowerRelationship') );
$valid_relationships{ _bad_data } = 1; # we handle this case in another way
- my @wrong_relationships = grep { !$valid_relationships{ $_->[0] } } @existing_relationships;
-
- if ( @wrong_relationships or $bad_relationships_count ) {
+ my $wrong_relationships = [ grep { !$valid_relationships{ $_->[0] } } @{$existing_relationships} ];
+ if ( @$wrong_relationships or $bad_relationships_count ) {
$template->param(
warnRelationships => 1,
);
- if ( @wrong_relationships ) {
+ if ( $wrong_relationships ) {
$template->param(
- wrong_relationships => \@wrong_relationships
+ wrong_relationships => $wrong_relationships
);
}
if ($bad_relationships_count) {
prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
warnPrefBiblioAddsAuthorities => $warnPrefBiblioAddsAuthorities,
warnPrefEasyAnalyticalRecords => $warnPrefEasyAnalyticalRecords,
- warnPrefAnonymousPatron => $warnPrefAnonymousPatron,
- warnPrefAnonymousPatron_PatronDoesNotExist => $warnPrefAnonymousPatron_PatronDoesNotExist,
+ warnPrefAnonymousPatronOPACPrivacy => $warnPrefAnonymousPatronOPACPrivacy,
+ warnPrefAnonymousPatronAnonSuggestions => $warnPrefAnonymousPatronAnonSuggestions,
+ warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist => $warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist,
+ warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist => $warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist,
errZebraConnection => $errZebraConnection,
warnIsRootUser => $warnIsRootUser,
warnNoActiveCurrency => $warnNoActiveCurrency,