From 0e9f743be6236e5a2118c555a17d41fea19ba5d1 Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 10 Oct 2008 13:25:25 +0000 Subject: [PATCH] use org ancester setting for sender address git-svn-id: svn://svn.open-ils.org/ILS/trunk@10814 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- .../support-scripts/generate_circ_notices.pl | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/Open-ILS/src/support-scripts/generate_circ_notices.pl b/Open-ILS/src/support-scripts/generate_circ_notices.pl index d00740f7a7..b33f8e1dd3 100755 --- a/Open-ILS/src/support-scripts/generate_circ_notices.pl +++ b/Open-ILS/src/support-scripts/generate_circ_notices.pl @@ -248,27 +248,16 @@ my %ORG_FROM_CACHE; sub get_from_addr { my $type = shift; my $org_id = shift; - my $sender; - if(defined $ORG_FROM_CACHE{$org_id}) { - # we have we already loaded the setting for this org unit - $sender = $ORG_FROM_CACHE{$org_id}; + return $ORG_FROM_CACHE{$org_id} if $ORG_FROM_CACHE{$org_id}; - } elsif(my $set = $e->search_actor_org_unit_setting( - {name => 'org.bounced_emails', org_unit => $org_id} )->[0]) { - my $bemail = OpenSRF::Utils::JSON->JSON2perl($set->value); - $sender = $ORG_FROM_CACHE{$org_id} = $bemail if $bemail; + if(my $bemail = $U->ou_ancestor_setting_value($org_id, 'org.bounced_emails', $e)) { + return $ORG_FROM_CACHE{$org_id} = $bemail; } - unless($sender) { - # there is no setting, use the configured sender - $sender = $settings->config_value( - notifications => $type => 'sender_address') || - $settings->config_value(notifications => 'sender_address'); - $ORG_FROM_CACHE{$org_id} = ''; - } - - return $sender; + return $ORG_FROM_CACHE{$org_id} = + $settings->config_value(notifications => $type => 'sender_address') || + $settings->config_value(notifications => 'sender_address'); } sub generate_notice { -- 2.43.2