Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / Koha / Library.pm

diff --git a/Koha/Library.pm b/Koha/Library.pm
index 8f40a89..b3f763a 100644 (file)
--- a/Koha/Library.pm
+++ b/Koha/Library.pm
@@ -4,18 +4,18 @@ package Koha::Library;
 #
 # This file is part of Koha.
 #
-# 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 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
 
@@ -65,6 +65,25 @@ sub get_effective_marcorgcode {
     return $self->marcorgcode || C4::Context->preference("MARCOrgCode");
 }
 
+=head3 inbound_email_address
+
+  my $to_email = Koha::Library->inbound_email_address;
+
+Returns an effective email address which should be accessible to librarians at the branch.
+
+=cut
+
+sub inbound_email_address {
+    my ($self) = @_;
+
+    return
+         $self->branchreplyto
+      || $self->branchemail
+      || C4::Context->preference('ReplytoDefault')
+      || C4::Context->preference('KohaAdminEmailAddress')
+      || undef;
+}
+
 =head3 library_groups
 
 Return the Library groups of this library
@@ -115,7 +134,6 @@ sub to_api_mapping {
         branchurl        => 'url',
         issuing          => undef,
         branchip         => 'ip',
-        branchprinter    => undef,
         branchnotes      => 'notes',
         marcorgcode      => 'marc_org_code',
     };