Bug 17600: Standardize our EXPORT_OK

On bug 17591 we discovered that there was something weird going on with
the way we export and use subroutines/modules.
This patch tries to standardize our EXPORT to use EXPORT_OK only.

That way we will need to explicitely define the subroutine we want to
use from a module.

This patch is a squashed version of:
Bug 17600: After export.pl
Bug 17600: After perlimport
Bug 17600: Manual changes
Bug 17600: Other manual changes after second perlimports run
Bug 17600: Fix tests

And a lot of other manual changes.

export.pl is a dirty script that can be found on bug 17600.

"perlimport" is:
git clone https://github.com/oalders/App-perlimports.git
cd App-perlimports/
cpanm --installdeps .
export PERL5LIB="$PERL5LIB:/kohadevbox/koha/App-perlimports/lib"
find . \( -name "*.pl" -o -name "*.pm" \) -exec perl App-perlimports/script/perlimports --inplace-edit --no-preserve-unused --filename {} \;

The ideas of this patch are to:
* use EXPORT_OK instead of EXPORT
* perltidy the EXPORT_OK list
* remove '&' before the subroutine names
* remove some uneeded use statements
* explicitely import the subroutines we need within the controllers or
modules

Note that the private subroutines (starting with _) should not be
exported (and not used from outside of the module except from tests).

EXPORT vs EXPORT_OK (from
https://www.thegeekstuff.com/2010/06/perl-exporter-examples/)
"""
Export allows to export the functions and variables of modules to user’s namespace using the standard import method. This way, we don’t need to create the objects for the modules to access it’s members.

@EXPORT and @EXPORT_OK are the two main variables used during export operation.

@EXPORT contains list of symbols (subroutines and variables) of the module to be exported into the caller namespace.

@EXPORT_OK does export of symbols on demand basis.
"""

If this patch caused a conflict with a patch you wrote prior to its
push:
* Make sure you are not reintroducing a "use" statement that has been
removed
* "$subroutine" is not exported by the C4::$MODULE module
means that you need to add the subroutine to the @EXPORT_OK list
* Bareword "$subroutine" not allowed while "strict subs"
means that you didn't imported the subroutine from the module:
  - use $MODULE qw( $subroutine list );
You can also use the fully qualified namespace: C4::$MODULE::$subroutine

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

C4/Accounts.pm

@@ -22,14 +22,11 @@ use Modern::Perl;
 use C4::Context;
 use C4::Stats;
 use C4::Members;
-use C4::Log qw(logaction);
 use Koha::Account;
 use Koha::Account::Lines;
 use Koha::Account::Offsets;
 use Koha::Items;
 
-use Mojo::Util qw(deprecated);
-use Data::Dumper qw(Dumper);
 
 use vars qw(@ISA @EXPORT);
 
@@ -37,8 +34,8 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-      &chargelostitem
-      &purge_zero_balance_fees
+      chargelostitem
+      purge_zero_balance_fees
     );
 }
 

C4/Acquisition.pm

@@ -19,13 +19,13 @@ package C4::Acquisition;
 
 
 use Modern::Perl;
-use Carp;
+use Carp qw( carp croak );
 use Text::CSV_XS;
 use C4::Context;
-use C4::Suggestions;
-use C4::Biblio;
-use C4::Contract;
-use C4::Log qw(logaction);
+use C4::Suggestions qw( GetSuggestion GetSuggestionFromBiblionumber ModSuggestion );
+use C4::Biblio qw( GetMarcFromKohaField GetMarcStructure IsMarcStructureInternal );
+use C4::Contract qw( GetContract );
+use C4::Log qw( logaction );
 use C4::Templates qw(gettemplate);
 use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Acquisition::Baskets;
@@ -42,60 +42,58 @@ use Koha::Patrons;
 use C4::Koha;
 
 use MARC::Field;
-use MARC::Record;
-use JSON qw(to_json);
+use JSON qw( to_json );
 
-use Time::localtime;
-
-use vars qw(@ISA @EXPORT);
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-    @EXPORT = qw(
-        &GetBasket &NewBasket &ReopenBasket &ModBasket
-        &GetBasketAsCSV &GetBasketGroupAsCSV
-        &GetBasketsByBookseller &GetBasketsByBasketgroup
-        &GetBasketsInfosByBookseller
-
-        &GetBasketUsers &ModBasketUsers
-        &CanUserManageBasket
-
-        &ModBasketHeader
-
-        &ModBasketgroup &NewBasketgroup &DelBasketgroup &GetBasketgroup &CloseBasketgroup
-        &GetBasketgroups &ReOpenBasketgroup
-
-        &ModOrder &GetOrder &GetOrders &GetOrdersByBiblionumber
-        &GetOrderFromItemnumber
-        &SearchOrders &GetHistory &GetRecentAcqui
-        &ModReceiveOrder &CancelReceipt
-        &TransferOrder
-        &ModItemOrder
-
-        &GetParcels
-
-        &GetInvoices
-        &GetInvoice
-        &GetInvoiceDetails
-        &AddInvoice
-        &ModInvoice
-        &CloseInvoice
-        &ReopenInvoice
-        &DelInvoice
-        &MergeInvoices
-
-        &AddClaim
-        &GetBiblioCountByBasketno
-
-        &GetOrderUsers
-        &ModOrderUsers
-        &NotifyOrderUsers
-
-        &FillWithDefaultValues
-
-        &get_rounded_price
-        &get_rounding_sql
+    @EXPORT_OK = qw(
+      GetBasket NewBasket ReopenBasket ModBasket
+      GetBasketAsCSV GetBasketGroupAsCSV
+      GetBasketsByBookseller GetBasketsByBasketgroup
+      GetBasketsInfosByBookseller
+
+      GetBasketUsers ModBasketUsers
+      CanUserManageBasket
+
+      ModBasketHeader
+
+      ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroup CloseBasketgroup
+      GetBasketgroups ReOpenBasketgroup
+
+      ModOrder GetOrder GetOrders GetOrdersByBiblionumber
+      GetOrderFromItemnumber
+      SearchOrders GetHistory GetRecentAcqui
+      ModReceiveOrder CancelReceipt
+      populate_order_with_prices
+      TransferOrder
+      ModItemOrder
+
+      GetParcels
+
+      GetInvoices
+      GetInvoice
+      GetInvoiceDetails
+      AddInvoice
+      ModInvoice
+      CloseInvoice
+      ReopenInvoice
+      DelInvoice
+      MergeInvoices
+
+      AddClaim
+      GetBiblioCountByBasketno
+
+      GetOrderUsers
+      ModOrderUsers
+      NotifyOrderUsers
+
+      FillWithDefaultValues
+
+      get_rounded_price
+      get_rounding_sql
     );
 }
 

C4/Auth.pm

@@ -19,14 +19,11 @@ package C4::Auth;
 
 use strict;
 use warnings;
-use Carp qw/croak/;
+use Carp qw( croak );
 
-use Digest::MD5 qw(md5_base64);
-use JSON qw/encode_json/;
-use URI::Escape;
+use Digest::MD5 qw( md5_base64 );
 use CGI::Session;
 
-require Exporter;
 use C4::Context;
 use C4::Templates;    # to get the template
 use C4::Languages;
@@ -34,25 +31,25 @@ use C4::Search::History;
 use Koha;
 use Koha::Logger;
 use Koha::Caches;
-use Koha::AuthUtils qw(get_script_name hash_password);
+use Koha::AuthUtils qw( get_script_name hash_password );
 use Koha::Checkouts;
-use Koha::DateUtils qw(dt_from_string);
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Library::Groups;
 use Koha::Libraries;
 use Koha::Cash::Registers;
 use Koha::Desks;
 use Koha::Patrons;
 use Koha::Patron::Consents;
-use POSIX qw/strftime/;
-use List::MoreUtils qw/ any /;
-use Encode qw( encode is_utf8);
-use C4::Auth_with_shibboleth;
+use List::MoreUtils qw( any );
+use Encode;
+use C4::Auth_with_shibboleth qw( shib_ok get_login_shib login_shib_url logout_shib checkpw_shib );
 use Net::CIDR;
-use C4::Log qw/logaction/;
+use C4::Log qw( logaction );
 
 # use utf8;
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $ldap $cas $caslogout);
 
+use vars qw($ldap $cas $caslogout);
+our (@ISA, @EXPORT_OK);
 BEGIN {
     sub psgi_env { any { /^psgi\./ } keys %ENV }
 
@@ -63,12 +60,15 @@ BEGIN {
 
     C4::Context->set_remote_address;
 
+    require Exporter;
     @ISA = qw(Exporter);
-    @EXPORT    = qw(&checkauth &get_template_and_user &haspermission &get_user_subpermissions);
-    @EXPORT_OK = qw(&check_api_auth &get_session &check_cookie_auth &checkpw &checkpw_internal &checkpw_hash
-      &get_all_subpermissions &get_user_subpermissions track_login_daily &in_iprange
+
+    @EXPORT_OK = qw(
+      checkauth check_api_auth get_session check_cookie_auth checkpw checkpw_internal checkpw_hash
+      get_all_subpermissions get_user_subpermissions track_login_daily in_iprange
+      get_template_and_user haspermission
     );
-    %EXPORT_TAGS = ( EditPermissions => [qw(get_all_subpermissions get_user_subpermissions)] );
+
     $ldap      = C4::Context->config('useldapserver') || 0;
     $cas       = C4::Context->preference('casAuthentication');
     $caslogout = C4::Context->preference('casLogout');

C4/Auth_with_cas.pm

@@ -21,20 +21,19 @@ use strict;
 use warnings;
 
 use C4::Context;
-use Koha::AuthUtils qw(get_script_name);
+use Koha::AuthUtils qw( get_script_name );
 use Authen::CAS::Client;
 use CGI qw ( -utf8 );
-use FindBin;
 use YAML::XS;
 
 use Koha::Logger;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+our (@ISA, @EXPORT_OK);
 
 BEGIN {
     require Exporter;
     @ISA   = qw(Exporter);
-    @EXPORT = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_if_required);
+    @EXPORT_OK = qw(check_api_auth_cas checkpw_cas login_cas logout_cas login_cas_url logout_if_required);
 }
 my $defaultcasserver;
 my $casservers;

C4/Auth_with_ldap.pm

@@ -18,23 +18,21 @@ package C4::Auth_with_ldap;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Carp;
+use Carp qw( croak );
 
 use C4::Context;
 use C4::Members::Messaging;
-use C4::Auth qw(checkpw_internal);
+use C4::Auth qw( checkpw_internal );
 use Koha::Patrons;
-use Koha::AuthUtils qw(hash_password);
-use List::MoreUtils qw( any );
+use Koha::AuthUtils qw( hash_password );
 use Net::LDAP;
 use Net::LDAP::Filter;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
 	require Exporter;
 	@ISA    = qw(Exporter);
-	@EXPORT = qw( checkpw_ldap );
+	@EXPORT_OK = qw( checkpw_ldap );
 }
 
 # Redefine checkpw_ldap:

C4/Auth_with_shibboleth.pm

@@ -20,22 +20,20 @@ package C4::Auth_with_shibboleth;
 use Modern::Perl;
 
 use C4::Context;
-use Koha::AuthUtils qw(get_script_name);
+use Koha::AuthUtils qw( get_script_name );
 use Koha::Database;
 use Koha::Patrons;
 use C4::Members::Messaging;
-use Carp;
-use CGI;
-use List::MoreUtils qw(any);
+use Carp qw( carp );
+use List::MoreUtils qw( any );
 
 use Koha::Logger;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA     = qw(Exporter);
-    @EXPORT =
+    @EXPORT_OK =
       qw(shib_ok logout_shib login_shib_url checkpw_shib get_login_shib);
 }
 

C4/AuthoritiesMarc.pm

@@ -21,13 +21,12 @@ package C4::AuthoritiesMarc;
 use strict;
 use warnings;
 use C4::Context;
-use MARC::Record;
-use C4::Biblio;
-use C4::Search;
+use C4::Biblio qw( GetFrameworkCode GetMarcBiblio ModBiblio );
+use C4::Search qw( FindDuplicate new_record_from_zebra );
 use C4::AuthoritiesMarc::MARC21;
 use C4::AuthoritiesMarc::UNIMARC;
-use C4::Charset;
-use C4::Log;
+use C4::Charset qw( SetUTF8Flag );
+use C4::Log qw( logaction );
 use Koha::MetadataRecord::Authority;
 use Koha::Authorities;
 use Koha::Authority::MergeRequests;
@@ -38,34 +37,37 @@ use Koha::SearchEngine;
 use Koha::SearchEngine::Indexer;
 use Koha::SearchEngine::Search;
 
-use vars qw(@ISA @EXPORT);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
 
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT = qw(
-	    &GetTagsLabels
-    	&GetAuthMARCFromKohaField 
-
-    	&AddAuthority
-    	&ModAuthority
-    	&DelAuthority
-    	&GetAuthority
-    	&GetAuthorityXML
-
-    	&SearchAuthorities
-    
-        &BuildSummary
-        &BuildAuthHierarchies
-        &BuildAuthHierarchy
-        &GenerateHierarchy
-    
-    	&merge
-    	&FindDuplicateAuthority
-
-        &GuessAuthTypeCode
-        &GuessAuthId
+    @EXPORT_OK = qw(
+      GetTagsLabels
+      GetAuthMARCFromKohaField
+
+      AddAuthority
+      ModAuthority
+      DelAuthority
+      GetAuthority
+      GetAuthorityXML
+
+      SearchAuthorities
+
+      BuildSummary
+      BuildAuthHierarchies
+      BuildAuthHierarchy
+      GenerateHierarchy
+      GetHeaderAuthority
+      AddAuthorityTrees
+      CompareFieldWithAuthority
+
+      merge
+      FindDuplicateAuthority
+
+      GuessAuthTypeCode
+      GuessAuthId
+      compare_fields
     );
 }
 

C4/AuthoritiesMarc/MARC21.pm

@@ -18,7 +18,6 @@ package C4::AuthoritiesMarc::MARC21;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use MARC::Record;
 
 =head1 NAME
 

C4/BackgroundJob.pm

@@ -20,7 +20,7 @@ package C4::BackgroundJob;
 
 use Modern::Perl;
 use C4::Context;
-use C4::Auth qw/get_session/;
+use C4::Auth qw( get_session );
 use Digest::MD5;
 
 

C4/Barcodes.pm

@@ -20,7 +20,7 @@ package C4::Barcodes;
 use strict;
 use warnings;
 
-use Carp;
+use Carp qw( carp );
 
 use C4::Context;
 use C4::Barcodes::hbyymmincr;
@@ -28,15 +28,8 @@ use C4::Barcodes::annual;
 use C4::Barcodes::incremental;
 use C4::Barcodes::EAN13;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 use vars qw($max $prefformat);
 
-BEGIN {
-	require Exporter;
-    @ISA = qw(Exporter);
-    @EXPORT_OK = qw();
-}
-
 sub _prefformat {
 	unless (defined $prefformat) {
 		unless ($prefformat = C4::Context->preference('autoBarcode')) {

C4/Barcodes/EAN13.pm

@@ -22,8 +22,8 @@ use warnings;
 
 use C4::Context;
 
-use Algorithm::CheckDigits;
-use Carp;
+use Algorithm::CheckDigits qw( CheckDigits );
+use Carp qw( carp );
 
 use vars qw(@ISA);
 

C4/Barcodes/annual.pm

@@ -20,11 +20,11 @@ package C4::Barcodes::annual;
 use strict;
 use warnings;
 
-use Carp;
+use Carp qw( carp );
 
 use C4::Context;
 
-use Koha::DateUtils qw( output_pref dt_from_string );
+use Koha::DateUtils qw( dt_from_string output_pref );
 
 use vars qw(@ISA);
 use vars qw($width);

C4/Barcodes/hbyymmincr.pm

@@ -19,7 +19,7 @@ package C4::Barcodes::hbyymmincr;
 
 use Modern::Perl;
 
-use Carp;
+use Carp qw( carp );
 
 use C4::Context;
 

C4/Biblio.pm

@@ -21,12 +21,12 @@ package C4::Biblio;
 
 use Modern::Perl;
 
-use vars qw(@ISA @EXPORT);
+use vars qw(@ISA @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
 
-    @EXPORT = qw(
+    @EXPORT_OK = qw(
         AddBiblio
         GetBiblioData
         GetMarcBiblio
@@ -45,6 +45,7 @@ BEGIN {
         GetMarcQuantity
         GetAuthorisedValueDesc
         GetMarcStructure
+        GetMarcSubfieldStructure
         IsMarcStructureInternal
         GetMarcFromKohaField
         GetMarcSubfieldStructureFromKohaField
@@ -54,6 +55,7 @@ BEGIN {
         CountItemsIssued
         ModBiblio
         ModZebra
+        EmbedItemsInMarcBiblio
         UpdateTotalIssues
         RemoveAllNsb
         DelBiblio
@@ -63,35 +65,42 @@ BEGIN {
         TransformHtmlToMarc
         TransformHtmlToXml
         prepare_host_field
+        TransformMarcToKohaOneField
     );
 
     # Internal functions
     # those functions are exported but should not be used
     # they are useful in a few circumstances, so they are exported,
     # but don't use them unless you are a core developer ;-)
-    push @EXPORT, qw(
+    push @EXPORT_OK, qw(
       ModBiblioMarc
     );
 }
 
-use Carp;
-use Try::Tiny;
+use Carp qw( carp );
+use Try::Tiny qw( catch try );
 
-use Encode qw( decode is_utf8 );
+use Encode;
 use List::MoreUtils qw( uniq );
 use MARC::Record;
 use MARC::File::USMARC;
 use MARC::File::XML;
-use POSIX qw(strftime);
-use Module::Load::Conditional qw(can_load);
+use POSIX qw( strftime );
+use Module::Load::Conditional qw( can_load );
 
 use C4::Koha;
-use C4::Log;    # logaction
+use C4::Log qw( logaction );    # logaction
 use C4::Budgets;
-use C4::ClassSource;
-use C4::Charset;
+use C4::ClassSource qw( GetClassSort );
+use C4::Charset qw(
+    nsb_clean
+    SetMarcUnicodeFlag
+    SetUTF8Flag
+    StripNonXmlChars
+);
 use C4::Linker;
 use C4::OAI::Sets;
+use C4::Items qw( GetHiddenItemnumbers GetMarcItem );
 
 use Koha::Logger;
 use Koha::Caches;
@@ -2572,7 +2581,6 @@ sub EmbedItemsInMarcBiblio {
     my $opachiddenitems = $opac
       && ( C4::Context->preference('OpacHiddenItems') !~ /^\s*$/ );
 
-    require C4::Items;
     while ( my ($itemnumber) = $sth->fetchrow_array ) {
         next if @$itemnumbers and not grep { $_ == $itemnumber } @$itemnumbers;
         my $item;

C4/Breeding.pm

@@ -22,22 +22,21 @@ use strict;
 use warnings;
 
 use C4::Biblio;
-use C4::Koha;
-use C4::Charset;
+use C4::Koha qw( GetNormalizedISBN );
+use C4::Charset qw( MarcToUTF8Record SetUTF8Flag );
 use MARC::File::USMARC;
 use MARC::Field;
-use C4::ImportBatch;
+use C4::ImportBatch qw( GetZ3950BatchId AddBiblioToBatch AddAuthToBatch );
 use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority
 use C4::Languages;
 use Koha::Database;
 use Koha::XSLT::Base;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-    @EXPORT = qw(&BreedingSearch &Z3950Search &Z3950SearchAuth);
+    @EXPORT_OK = qw(BreedingSearch Z3950Search Z3950SearchAuth);
 }
 
 =head1 NAME

C4/Budgets.pm

@@ -23,53 +23,60 @@ use Koha::Database;
 use Koha::Patrons;
 use Koha::Acquisition::Invoice::Adjustments;
 use C4::Acquisition;
-use vars qw(@ISA @EXPORT);
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT = qw(
-
-        &GetBudget
-        &GetBudgetByOrderNumber
-        &GetBudgetByCode
-        &GetBudgets
-        &BudgetsByActivity
-        &GetBudgetsReport
-        &GetBudgetReport
-        &GetBudgetHierarchy
-	    &AddBudget
-        &ModBudget
-        &DelBudget
-        &GetBudgetSpent
-        &GetBudgetOrdered
-        &GetBudgetName
-        &GetPeriodsCount
+    @EXPORT_OK = qw(
+
+      GetBudget
+      GetBudgetByOrderNumber
+      GetBudgetByCode
+      GetBudgets
+      BudgetsByActivity
+      GetBudgetsReport
+      GetBudgetReport
+      GetBudgetsByActivity
+      GetBudgetHierarchy
+      AddBudget
+      ModBudget
+      DelBudget
+      GetBudgetSpent
+      GetBudgetOrdered
+      GetBudgetName
+      GetPeriodsCount
       GetBudgetHierarchySpent
       GetBudgetHierarchyOrdered
 
-        &GetBudgetUsers
-        &ModBudgetUsers
-        &CanUserUseBudget
-        &CanUserModifyBudget
-
-	    &GetBudgetPeriod
-        &GetBudgetPeriods
-        &ModBudgetPeriod
-        &AddBudgetPeriod
-	    &DelBudgetPeriod
-
-        &ModBudgetPlan
-
-		&GetBudgetsPlanCell
-        &AddBudgetPlanValue
-        &GetBudgetAuthCats
-        &BudgetHasChildren
-        &CheckBudgetParent
-        &CheckBudgetParentPerm
-
-        &HideCols
-        &GetCols
+      GetBudgetUsers
+      ModBudgetUsers
+      CanUserUseBudget
+      CanUserModifyBudget
+
+      GetBudgetPeriod
+      GetBudgetPeriods
+      ModBudgetPeriod
+      AddBudgetPeriod
+      DelBudgetPeriod
+
+      ModBudgetPlan
+
+      GetBudgetsPlanCell
+      AddBudgetPlanValue
+      GetBudgetAuthCats
+      BudgetHasChildren
+      GetBudgetChildren
+      SetOwnerToFundHierarchy
+      CheckBudgetParent
+      CheckBudgetParentPerm
+
+      HideCols
+      GetCols
+
+      CloneBudgetPeriod
+      CloneBudgetHierarchy
+      MoveOrders
     );
 }
 

C4/Calendar.pm

@@ -19,8 +19,8 @@ use strict;
 use warnings;
 use vars qw(@EXPORT);
 
-use Carp;
-use Date::Calc qw( Date_to_Days Today);
+use Carp qw( croak );
+use Date::Calc qw( Today );
 
 use C4::Context;
 use Koha::Caches;

C4/Charset.pm

@@ -19,19 +19,18 @@ package C4::Charset;
 
 use Modern::Perl;
 
-use MARC::Charset qw/marc8_to_utf8/;
+use MARC::Charset;
 use Text::Iconv;
-use Unicode::Normalize;
-use Encode qw( decode encode is_utf8 );
+use Unicode::Normalize qw( NFC NFD );
+use Encode;
 
 use Koha::Logger;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
-    @EXPORT = qw(
+    @EXPORT_OK = qw(
         NormalizeString
         IsStringUTF8ish
         MarcToUTF8Record

C4/Circulation.pm

@@ -24,32 +24,31 @@ use POSIX qw( floor );
 use YAML::XS;
 use Encode;
 
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use C4::Context;
-use C4::Stats;
-use C4::Reserves;
-use C4::Biblio;
-use C4::Items;
-use C4::Members;
+use C4::Stats qw( UpdateStats );
+use C4::Reserves qw( CheckReserves CanItemBeReserved MoveReserve ModReserve ModReserveMinusPriority RevertWaitingStatus IsItemOnHoldAndFound IsAvailableForItemLevelRequest );
+use C4::Biblio qw( UpdateTotalIssues );
+use C4::Items qw( ModItemTransfer ModDateLastSeen CartToShelf );
 use C4::Accounts;
 use C4::ItemCirculationAlertPreference;
 use C4::Message;
-use C4::Log; # logaction
-use C4::Overdues qw(CalcFine UpdateFine get_chargeable_units);
+use C4::Log qw( logaction ); # logaction
+use C4::Overdues;
 use C4::RotatingCollections qw(GetCollectionItemBranches);
-use Algorithm::CheckDigits;
+use Algorithm::CheckDigits qw( CheckDigits );
 
-use Data::Dumper;
+use Data::Dumper qw( Dumper );
 use Koha::Account;
 use Koha::AuthorisedValues;
 use Koha::Biblioitems;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Calendar;
 use Koha::Checkouts;
 use Koha::Illrequests;
 use Koha::Items;
 use Koha::Patrons;
-use Koha::Patron::Debarments;
+use Koha::Patron::Debarments qw( DelUniqueDebarment GetDebarments );
 use Koha::Database;
 use Koha::Libraries;
 use Koha::Account::Lines;
@@ -62,77 +61,68 @@ use Koha::Config::SysPref;
 use Koha::Checkouts::ReturnClaims;
 use Koha::SearchEngine::Indexer;
 use Koha::Exceptions::Checkout;
-use Carp;
-use List::MoreUtils qw( uniq any );
+use Carp qw( carp );
+use List::MoreUtils qw( any );
 use Scalar::Util qw( looks_like_number );
-use Try::Tiny;
-use Date::Calc qw(
-  Today
-  Today_and_Now
-  Add_Delta_YM
-  Add_Delta_DHMS
-  Date_to_Days
-  Day_of_Week
-  Add_Delta_Days
-);
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+use Date::Calc qw( Date_to_Days );
+our (@ISA, @EXPORT_OK);
 BEGIN {
+
     require Exporter;
     @ISA = qw(Exporter);
 
     # FIXME subs that should probably be elsewhere
-	push @EXPORT, qw(
-		&barcodedecode
-        &LostItem
-        &ReturnLostItem
-        &GetPendingOnSiteCheckouts
-	);
-
-	# subs to deal with issuing a book
-	push @EXPORT, qw(
-		&CanBookBeIssued
-		&CanBookBeRenewed
-		&AddIssue
-		&AddRenewal
-		&GetRenewCount
-        &GetSoonestRenewDate
-        &GetLatestAutoRenewDate
-		&GetIssuingCharges
-        &GetBranchBorrowerCircRule
-        &GetBranchItemRule
-		&GetOpenIssue
-        &CheckIfIssuedToPatron
-        &IsItemIssued
+    push @EXPORT_OK, qw(
+      barcodedecode
+      LostItem
+      ReturnLostItem
+      GetPendingOnSiteCheckouts
+
+      CanBookBeIssued
+      checkHighHolds
+      CanBookBeRenewed
+      AddIssue
+      GetLoanLength
+      GetHardDueDate
+      AddRenewal
+      GetRenewCount
+      GetSoonestRenewDate
+      GetLatestAutoRenewDate
+      GetIssuingCharges
+      AddIssuingCharge
+      GetBranchBorrowerCircRule
+      GetBranchItemRule
+      GetBiblioIssues
+      GetOpenIssue
+      GetUpcomingDueIssues
+      CheckIfIssuedToPatron
+      IsItemIssued
+      GetAgeRestriction
       GetTopIssues
-	);
-
-	# subs to deal with returns
-	push @EXPORT, qw(
-		&AddReturn
-        &MarkIssueReturned
-	);
-
-	# subs to deal with transfers
-	push @EXPORT, qw(
-		&transferbook
-		&GetTransfers
-		&GetTransfersFromTo
-		&updateWrongTransfer
-                &IsBranchTransferAllowed
-                &CreateBranchTransferLimit
-                &DeleteBranchTransferLimits
-        &TransferSlip
-	);
 
-    # subs to deal with offline circulation
-    push @EXPORT, qw(
-      &GetOfflineOperations
-      &GetOfflineOperation
-      &AddOfflineOperation
-      &DeleteOfflineOperation
-      &ProcessOfflineOperation
+      AddReturn
+      MarkIssueReturned
+
+      transferbook
+      TooMany
+      GetTransfers
+      GetTransfersFromTo
+      updateWrongTransfer
+      CalcDateDue
+      CheckValidBarcode
+      IsBranchTransferAllowed
+      CreateBranchTransferLimit
+      DeleteBranchTransferLimits
+      TransferSlip
+
+      GetOfflineOperations
+      GetOfflineOperation
+      AddOfflineOperation
+      DeleteOfflineOperation
+      ProcessOfflineOperation
+      ProcessOfflinePayment
     );
+    push @EXPORT_OK, '_GetCircControlBranch';    # This is wrong!
 }
 
 =head1 NAME

C4/ClassSortRoutine.pm

@@ -20,12 +20,18 @@ package C4::ClassSortRoutine;
 use strict;
 use warnings;
 
-require Exporter;
 use Class::Factory::Util;
 use C4::Context;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+       GetSortRoutineNames
+       GetClassSortKey
+    );
+}
 
 =head1 NAME 
 
@@ -40,12 +46,6 @@ use C4::ClassSortRoutine;
 
 =cut
 
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-   &GetSortRoutineNames
-   &GetClassSortKey
-);
-
 # initialization code
 my %loaded_routines = ();
 my @sort_routines = GetSortRoutineNames();

C4/ClassSortRoutine/Dewey.pm

@@ -28,7 +28,7 @@ C4::ClassSortRoutine::Dewey - generic call number sorting key routine
 
 =head1 SYNOPSIS
 
-use C4::ClassSortRoutine;
+use C4::ClassSortRoutine qw( GetClassSortKey );
 
 my $cn_sort = GetClassSortKey('Dewey', $cn_class, $cn_item);
 

C4/ClassSortRoutine/Generic.pm

@@ -28,7 +28,7 @@ C4::ClassSortRoutine::Generic - generic call number sorting key routine
 
 =head1 SYNOPSIS
 
-use C4::ClassSortRoutine;
+use C4::ClassSortRoutine qw( GetClassSortKey );
 
 my $cn_sort = GetClassSortKey('Generic', $cn_class, $cn_item);
 

C4/ClassSortRoutine/LCC.pm

@@ -30,7 +30,7 @@ C4::ClassSortRoutine::LCC - generic call number sorting key routine
 
 =head1 SYNOPSIS
 
-use C4::ClassSortRoutine;
+use C4::ClassSortRoutine qw( GetClassSortKey );
 
 my $cn_sort = GetClassSortKey('LCC', $cn_class, $cn_item);
 

C4/ClassSource.pm

@@ -20,12 +20,20 @@ package C4::ClassSource;
 use strict;
 use warnings;
 
-require Exporter;
 use C4::Context;
-use C4::ClassSortRoutine;
-
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+use C4::ClassSortRoutine qw( GetClassSortKey );
+
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+        GetClassSources
+        GetClassSource
+        GetClassSortRule
+        GetClassSort
+    );
+}
 
 =head1 NAME
 
@@ -44,17 +52,6 @@ sources and sorting rules.
 
 =cut
 
-
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-    &GetClassSources
-    &GetClassSource
-    &GetClassSortRule
-
-    &GetClassSort
-
-);
-
 =head2 GetClassSources
 
   my $sources = GetClassSources();

C4/ClassSplitRoutine.pm

@@ -20,7 +20,6 @@ package C4::ClassSplitRoutine;
 use Modern::Perl;
 
 require Exporter;
-use Class::Factory::Util;
 
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
@@ -39,7 +38,7 @@ use C4::ClassSplitRoutine;
 
 @ISA    = qw(Exporter);
 @EXPORT = qw(
-   &GetSplitRoutineNames
+   GetSplitRoutineNames
 );
 
 =head2 GetSplitRoutineNames

C4/Context.pm

@@ -35,12 +35,11 @@ BEGIN {
     }
 };
 
-use Carp;
+use Carp qw( carp );
 use DateTime::TimeZone;
 use Encode;
 use File::Spec;
-use Module::Load::Conditional qw(can_load);
-use POSIX ();
+use POSIX;
 use YAML::XS;
 use ZOOM;
 

C4/Contract.pm

@@ -27,11 +27,11 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-        &GetContracts
-        &GetContract
-        &AddContract
-        &ModContract
-        &DelContract
+      GetContracts
+      GetContract
+      AddContract
+      ModContract
+      DelContract
     );
 }
 

C4/CourseReserves.pm

@@ -17,43 +17,42 @@ package C4::CourseReserves;
 
 use Modern::Perl;
 
-use List::MoreUtils qw(any);
+use List::MoreUtils qw( any );
 
 use C4::Context;
-use C4::Circulation qw(GetOpenIssue);
+use C4::Circulation qw( GetOpenIssue );
 
 use Koha::Courses;
 use Koha::Course::Instructors;
 use Koha::Course::Items;
 use Koha::Course::Reserves;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS @FIELDS);
-
+use vars qw(@FIELDS);
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
     @EXPORT_OK = qw(
-      &GetCourse
-      &ModCourse
-      &GetCourses
-      &DelCourse
+      GetCourse
+      ModCourse
+      GetCourses
+      DelCourse
 
-      &GetCourseInstructors
-      &ModCourseInstructors
+      GetCourseInstructors
+      ModCourseInstructors
 
-      &GetCourseItem
-      &ModCourseItem
+      GetCourseItem
+      ModCourseItem
 
-      &GetCourseReserve
-      &ModCourseReserve
-      &GetCourseReserves
-      &DelCourseReserve
+      GetCourseReserve
+      ModCourseReserve
+      GetCourseReserves
+      DelCourseReserve
 
-      &SearchCourses
+      SearchCourses
 
-      &GetItemCourseReservesInfo
+      GetItemCourseReservesInfo
     );
-    %EXPORT_TAGS = ( 'all' => \@EXPORT_OK );
 
     @FIELDS = ( 'itype', 'ccode', 'homebranch', 'holdingbranch', 'location' );
 }

C4/Creators.pm

@@ -38,7 +38,23 @@ BEGIN {
                      get_unit_values
                      html_table
     );
-    use C4::Creators::Lib;
+    use C4::Creators::Lib qw(
+    get_all_image_names
+    get_all_layouts
+    get_all_profiles
+    get_all_templates
+    get_barcode_types
+    get_batch_summary
+    get_card_summary
+    get_font_types
+    get_label_summary
+    get_label_types
+    get_output_formats
+    get_table_names
+    get_text_justification_types
+    get_unit_values
+    html_table
+);
     use C4::Creators::PDF;
 }
 

C4/Creators/Lib.pm

@@ -18,7 +18,7 @@ package C4::Creators::Lib;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Storable qw(dclone);
+use Storable qw( dclone );
 
 use autouse 'Data::Dumper' => qw(Dumper);
 

C4/Creators/PDF.pm

@@ -19,10 +19,41 @@ package C4::Creators::PDF;
 
 use strict;
 use warnings;
-use PDF::Reuse;
+use PDF::Reuse qw(
+    prAdd
+    prAltJpeg
+    prBookmark
+    prCompress
+    prDoc
+    prDocDir
+    prDocForm
+    prEnd
+    prExtract
+    prField
+    prFile
+    prFont
+    prFontSize
+    prForm
+    prGetLogBuffer
+    prGraphState
+    prImage
+    prInit
+    prInitVars
+    prJpeg
+    prJs
+    prLink
+    prLog
+    prLogDir
+    prMbox
+    prPage
+    prSinglePage
+    prStrWidth
+    prText
+    prTTFont
+);
 use PDF::Reuse::Barcode;
 use File::Temp;
-use List::Util qw/first/;
+use List::Util qw( first );
 
 
 sub _InitVars {

C4/Creators/Profile.pm

@@ -6,7 +6,7 @@ use warnings;
 use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Context;
-use C4::Creators::Lib qw(get_unit_values);
+use C4::Creators::Lib qw( get_unit_values );
 
 
 sub _check_params {

C4/Creators/Template.pm

@@ -2,12 +2,12 @@ package C4::Creators::Template;
 
 use strict;
 use warnings;
-use POSIX qw(ceil);
+use POSIX qw( ceil );
 use autouse 'Data::Dumper' => qw(Dumper);
 
 use C4::Context;
 use C4::Creators::Profile;
-use C4::Creators::Lib qw(get_unit_values);
+use C4::Creators::Lib qw( get_unit_values );
 
 
 sub _check_params {

C4/External/BakerTaylor.pm

@@ -19,21 +19,20 @@ package C4::External::BakerTaylor;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use XML::Simple;
-use LWP::Simple;
-use HTTP::Request::Common;
+use LWP::Simple qw( get );
 
 use C4::Context;
 
 use Modern::Perl;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
+use vars qw(%EXPORT_TAGS $VERSION);
+our (@ISA, @EXPORT_OK);
 
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
     $VERSION = 3.07.00.049;
-	@EXPORT_OK = qw(&availability &content_cafe &image_url &link_url &http_jacket_link);
-	%EXPORT_TAGS = (all=>\@EXPORT_OK);
+    @EXPORT_OK = qw(availability content_cafe_url image_url link_url http_jacket_link);
 }
 
 # These variables are plack safe: they are initialized each time

C4/External/OverDrive.pm

@@ -21,7 +21,7 @@ use strict;
 use warnings;
 
 use Koha;
-use JSON;
+use JSON qw( from_json );
 use Koha::Caches;
 use HTTP::Request;
 use HTTP::Request::Common;

C4/External/Syndetics.pm

@@ -17,11 +17,10 @@ package C4::External::Syndetics;
 # You should have received a copy of the GNU General Public License
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use XML::Simple;
+use XML::Simple qw( XMLout );
 use XML::LibXML;
-use LWP::Simple;
+use LWP::Simple qw( $ua );
 use LWP::UserAgent;
-use HTTP::Request::Common;
 
 use strict;
 use warnings;
@@ -32,13 +31,13 @@ BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
     @EXPORT = qw(
-        &get_syndetics_index
-        &get_syndetics_summary
-        &get_syndetics_toc
-        &get_syndetics_editions
-        &get_syndetics_excerpt
-        &get_syndetics_reviews
-        &get_syndetics_anotes
+        get_syndetics_index
+        get_syndetics_summary
+        get_syndetics_toc
+        get_syndetics_editions
+        get_syndetics_excerpt
+        get_syndetics_reviews
+        get_syndetics_anotes
     );
 }
 

C4/Heading.pm

@@ -19,11 +19,9 @@ package C4::Heading;
 
 use Modern::Perl;
 
-use MARC::Record;
 use MARC::Field;
 use C4::Context;
-use Module::Load;
-use Carp;
+use Module::Load qw( load );
 
 
 =head1 NAME

C4/Heading/MARC21.pm

@@ -19,7 +19,6 @@ package C4::Heading::MARC21;
 
 use strict;
 use warnings;
-use MARC::Record;
 use MARC::Field;
 
 

C4/Heading/UNIMARC.pm

@@ -20,7 +20,6 @@ package C4::Heading::UNIMARC;
 use 5.010;
 use strict;
 use warnings;
-use MARC::Record;
 use MARC::Field;
 use C4::Context;
 

C4/HoldsQueue.pm

@@ -24,29 +24,26 @@ use warnings;
 
 use C4::Context;
 use C4::Search;
-use C4::Items;
-use C4::Circulation;
-use C4::Members;
-use C4::Biblio;
-use Koha::DateUtils;
+use C4::Circulation qw( GetTransfers GetBranchItemRule );
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 use Koha::Patrons;
 use Koha::Libraries;
 
-use List::Util qw(shuffle);
-use List::MoreUtils qw(any);
-use Data::Dumper;
+use List::Util qw( shuffle );
+use List::MoreUtils qw( any );
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
     @EXPORT_OK = qw(
-        &CreateQueue
-        &GetHoldsQueueItems
+        CreateQueue
+        GetHoldsQueueItems
 
-        &TransportCostMatrix
-        &UpdateTransportCostMatrix
+        TransportCostMatrix
+        UpdateTransportCostMatrix
+        GetPendingHoldRequestsForBib
      );
 }
 

C4/ILSDI/Services.pm

@@ -21,19 +21,17 @@ use strict;
 use warnings;
 
 use C4::Members;
-use C4::Items;
-use C4::Circulation;
+use C4::Items qw( get_hostitemnumbers_of );
+use C4::Circulation qw( CanBookBeRenewed barcodedecode CanBookBeIssued AddRenewal );
 use C4::Accounts;
-use C4::Biblio;
-use C4::Reserves qw(AddReserve CanBookBeReserved CanItemBeReserved IsAvailableForItemLevelRequest);
+use C4::Biblio qw( GetMarcBiblio );
+use C4::Reserves qw( CanBookBeReserved IsAvailableForItemLevelRequest CalculatePriority AddReserve CanItemBeReserved );
 use C4::Context;
-use C4::AuthoritiesMarc;
-use XML::Simple;
-use HTML::Entities;
+use C4::Auth;
 use CGI qw ( -utf8 );
 use DateTime;
 use C4::Auth;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use Koha::Biblios;
 use Koha::Checkouts;

C4/ImportBatch.pm

@@ -21,26 +21,33 @@ use strict;
 use warnings;
 
 use C4::Context;
-use C4::Koha;
-use C4::Biblio;
-use C4::Items;
-use C4::Charset;
+use C4::Koha qw( GetNormalizedISBN );
+use C4::Biblio qw(
+    AddBiblio
+    DelBiblio
+    GetMarcFromKohaField
+    GetXmlBiblio
+    ModBiblio
+    TransformMarcToKoha
+);
+use C4::Items qw( AddItemFromMarc ModItemFromMarc );
+use C4::Charset qw( MarcToUTF8Record SetUTF8Flag StripNonXmlChars );
 use C4::AuthoritiesMarc;
-use C4::MarcModificationTemplates;
+use C4::MarcModificationTemplates qw( ModifyRecordWithTemplate );
 use Koha::Items;
 use Koha::Plugins::Handler;
 use Koha::Logger;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT = qw(
+    @EXPORT_OK = qw(
       GetZ3950BatchId
       GetWebserviceBatchId
       GetImportRecordMarc
       GetImportRecordMarcXML
+      GetRecordFromImportBiblio
       AddImportBatch
       GetImportBatch
       AddAuthToBatch
@@ -81,6 +88,10 @@ BEGIN {
       SetMatchedBiblionumber
       GetImportRecordMatches
       SetImportRecordMatches
+
+      RecordsFromMARCXMLFile
+      RecordsFromISO2709File
+      RecordsFromMarcPlugin
     );
 }
 

C4/ImportExportFramework.pm

@@ -21,23 +21,22 @@ use strict;
 use warnings;
 use XML::LibXML;
 use XML::LibXML::XPathContext;
-use Digest::MD5 qw();
-use POSIX qw(strftime);
+use Digest::MD5;
+use POSIX qw( strftime );
 use Text::CSV_XS;
-use List::MoreUtils qw(indexes);
+use List::MoreUtils qw( indexes );
 
 use C4::Context;
 use Koha::Logger;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
-    @EXPORT = qw(
-        &ExportFramework
-        &ImportFramework
-        &createODS
+    @EXPORT_OK = qw(
+        ExportFramework
+        ImportFramework
+        createODS
     );
 }
 

C4/InstallAuth.pm

@@ -18,24 +18,23 @@ package C4::InstallAuth;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Digest::MD5 qw(md5_base64);
 use CGI::Session;
 use File::Spec;
 
 require Exporter;
 
 use C4::Context;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
 use C4::Templates;
-use C4::Koha;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-  &checkauth
-  &get_template_and_user
-);
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+      checkauth
+      get_template_and_user
+    );
+}
 
 =head1 NAME
 

C4/Installer.pm

@@ -19,7 +19,7 @@ package C4::Installer;
 
 use Modern::Perl;
 
-use Encode qw( encode is_utf8 );
+use Encode;
 use DBIx::RunSQL;
 use YAML::XS;
 use C4::Context;
@@ -30,7 +30,7 @@ use vars qw(@ISA @EXPORT);
 BEGIN {
     require Exporter;
     @ISA = qw( Exporter );
-    push @EXPORT, qw( primary_key_exists foreign_key_exists index_exists column_exists TableExists);
+    push @EXPORT, qw( primary_key_exists foreign_key_exists index_exists column_exists TableExists marc_framework_sql_list);
 };
 
 =head1 NAME

C4/Installer/PerlModules.pm

@@ -3,8 +3,7 @@ package C4::Installer::PerlModules;
 use warnings;
 use strict;
 
-use File::Spec;
-use File::Basename;
+use File::Basename qw( dirname );
 use Module::CPANfile;
 
 sub new {

C4/Installer/UpgradeBackup.pm

@@ -18,10 +18,10 @@ package C4::Installer::UpgradeBackup;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use File::Compare qw(compare);
-use Cwd qw(cwd);
+use File::Compare qw( compare );
+use Cwd qw( cwd );
 use File::Copy;
-use File::Find;
+use File::Find qw( find );
 use File::Spec;
 use Exporter;
 

C4/ItemCirculationAlertPreference.pm

@@ -20,7 +20,7 @@ package C4::ItemCirculationAlertPreference;
 use strict;
 use warnings;
 use C4::Context;
-use Carp qw(carp croak);
+use Carp qw( carp croak );
 
 use Koha::ItemTypes;
 use Koha::Patron::Categories;

C4/Items.pm

@@ -20,12 +20,12 @@ package C4::Items;
 
 use Modern::Perl;
 
-use vars qw(@ISA @EXPORT);
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
 
-    @EXPORT = qw(
+    @EXPORT_OK = qw(
         AddItemFromMarc
         AddItemBatchFromMarc
         ModItemFromMarc
@@ -39,30 +39,30 @@ BEGIN {
         GetHostItemsInfo
         get_hostitemnumbers_of
         GetHiddenItemnumbers
+        GetMarcItem
         MoveItemFromBiblio
         CartToShelf
         GetAnalyticsCount
         SearchItems
         PrepareItemrecordDisplay
+        ToggleNewStatus
     );
 }
 
-use Carp;
-use Try::Tiny;
+use Carp qw( croak );
 use C4::Context;
 use C4::Koha;
-use C4::Biblio;
-use Koha::DateUtils;
+use C4::Biblio qw( GetMarcStructure TransformMarcToKoha );
+use Koha::DateUtils qw( dt_from_string output_pref );
 use MARC::Record;
-use C4::ClassSource;
-use C4::Log;
-use List::MoreUtils qw(any);
+use C4::ClassSource qw( GetClassSort GetClassSources GetClassSource );
+use C4::Log qw( logaction );
+use List::MoreUtils qw( any );
 use DateTime::Format::MySQL;
-use Data::Dumper; # used as part of logging item record changes, not just for
                   # debugging; so please don't remove this
 
 use Koha::AuthorisedValues;
-use Koha::DateUtils qw(dt_from_string);
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Database;
 
 use Koha::Biblioitems;

C4/Koha.pm

@@ -30,32 +30,33 @@ use Koha::MarcSubfieldStructures;
 use Business::ISBN;
 use Business::ISSN;
 use autouse 'Data::cselectall_arrayref' => qw(Dumper);
-use vars qw(@ISA @EXPORT @EXPORT_OK);
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT = qw(
-        &GetItemTypesCategorized
-        &getallthemes
-        &getFacets
-        &getnbpages
-		&getitemtypeimagedir
-		&getitemtypeimagesrc
-		&getitemtypeimagelocation
-		&GetAuthorisedValues
-		&GetNormalizedUPC
-		&GetNormalizedISBN
-		&GetNormalizedEAN
-		&GetNormalizedOCLCNumber
-        &xml_escape
-
-        &GetVariationsOfISBN
-        &GetVariationsOfISBNs
-        &NormalizeISBN
-        &GetVariationsOfISSN
-        &GetVariationsOfISSNs
-        &NormalizeISSN
+    @EXPORT_OK = qw(
+      GetItemTypesCategorized
+      getallthemes
+      getFacets
+      getImageSets
+      getnbpages
+      getitemtypeimagedir
+      getitemtypeimagesrc
+      getitemtypeimagelocation
+      GetAuthorisedValues
+      GetNormalizedUPC
+      GetNormalizedISBN
+      GetNormalizedEAN
+      GetNormalizedOCLCNumber
+      xml_escape
+
+      GetVariationsOfISBN
+      GetVariationsOfISBNs
+      NormalizeISBN
+      GetVariationsOfISSN
+      GetVariationsOfISSNs
+      NormalizeISSN
 
     );
 }

C4/Labels/Label.pm

@@ -3,14 +3,13 @@ package C4::Labels::Label;
 use strict;
 use warnings;
 
-use Text::Wrap;
-use Algorithm::CheckDigits;
+use Text::Wrap qw( wrap );
+use Algorithm::CheckDigits qw( CheckDigits );
 use Text::CSV_XS;
-use Data::Dumper;
 use Text::Bidi qw( log2vis );
 
 use C4::Context;
-use C4::Biblio;
+use C4::Biblio qw( GetMarcBiblio GetMarcFromKohaField );
 use Koha::ClassSources;
 use Koha::ClassSortRules;
 use Koha::ClassSplitRules;

C4/Languages.pm

@@ -22,24 +22,24 @@ package C4::Languages;
 use strict;
 use warnings;
 
-use Carp;
+use Carp qw( carp );
 use CGI;
 use List::MoreUtils qw( any );
 use C4::Context;
 use Koha::Caches;
 use Koha::Cache::Memory::Lite;
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
-    @EXPORT = qw(
-        &getFrameworkLanguages
-        &getTranslatedLanguages
-        &getLanguages
-        &getAllLanguages
+    @EXPORT_OK = qw(
+        getFrameworkLanguages
+        getTranslatedLanguages
+        getLanguages
+        getAllLanguages
     );
-    @EXPORT_OK = qw(getFrameworkLanguages getTranslatedLanguages getAllLanguages getLanguages get_bidi regex_lang_subtags language_get_description accept_language getlanguage);
+    push @EXPORT_OK, qw(getFrameworkLanguages getTranslatedLanguages getAllLanguages getLanguages get_bidi regex_lang_subtags language_get_description accept_language getlanguage get_rfc4646_from_iso639);
 }
 
 =head1 NAME

C4/Letters.pm

@@ -20,36 +20,47 @@ package C4::Letters;
 use Modern::Perl;
 
 use MIME::Lite;
-use Date::Calc qw( Add_Delta_Days );
-use Encode;
-use Carp;
+use Carp qw( carp croak );
 use Template;
-use Module::Load::Conditional qw(can_load);
+use Module::Load::Conditional qw( can_load );
 
-use Try::Tiny;
+use Try::Tiny qw( catch try );
 
 use C4::Members;
-use C4::Log;
+use C4::Log qw( logaction );
 use C4::SMS;
 use C4::Templates;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::SMS::Providers;
 
 use Koha::Email;
 use Koha::Notice::Messages;
 use Koha::Notice::Templates;
-use Koha::DateUtils qw( format_sqldatetime dt_from_string );
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patrons;
 use Koha::SMTP::Servers;
 use Koha::Subscriptions;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
-    @EXPORT = qw(
-        &EnqueueLetter &GetLetters &GetLettersAvailableForALibrary &GetLetterTemplates &DelLetter &GetPreparedLetter &GetWrappedLetter &SendAlerts &GetPrintMessages &GetMessageTransportTypes
+    @EXPORT_OK = qw(
+      GetLetters
+      GetLettersAvailableForALibrary
+      GetLetterTemplates
+      DelLetter
+      GetPreparedLetter
+      GetWrappedLetter
+      SendAlerts
+      GetPrintMessages
+      GetQueuedMessages
+      GetMessage
+      GetMessageTransportTypes
+
+      EnqueueLetter
+      SendQueuedMessages
+      ResendMessage
     );
 }
 

C4/Linker.pm

@@ -47,7 +47,6 @@ to the preferred form.
 
 use strict;
 use warnings;
-use Carp;
 use C4::Context;
 
 use base qw(Class::Accessor);

C4/Linker/Default.pm

@@ -19,7 +19,6 @@ package C4::Linker::Default;
 
 use strict;
 use warnings;
-use Carp;
 use MARC::Field;
 use C4::Heading;
 

C4/Linker/FirstMatch.pm

@@ -19,7 +19,6 @@ package C4::Linker::FirstMatch;
 
 use strict;
 use warnings;
-use Carp;
 use C4::Heading;
 use C4::Linker::Default;    # Use Default for flipping
 

C4/Linker/LastMatch.pm

@@ -19,7 +19,6 @@ package C4::Linker::LastMatch;
 
 use strict;
 use warnings;
-use Carp;
 use C4::Heading;
 use C4::Linker::Default;    # Use Default for flipping
 

C4/Log.pm

@@ -27,7 +27,6 @@ use warnings;
 use JSON qw( to_json );
 
 use C4::Context;
-use Koha::DateUtils;
 use Koha::Logger;
 
 use vars qw(@ISA @EXPORT);
@@ -35,7 +34,7 @@ use vars qw(@ISA @EXPORT);
 BEGIN {
         require Exporter;
         @ISA = qw(Exporter);
-        @EXPORT = qw(&logaction &cronlogaction);
+        @EXPORT = qw(logaction cronlogaction);
 }
 
 =head1 NAME

C4/MarcModificationTemplates.pm

@@ -22,29 +22,38 @@ use Modern::Perl;
 use DateTime;
 
 use C4::Context;
-use Koha::SimpleMARC;
+use Koha::SimpleMARC qw(
+    add_field
+    copy_and_replace_field
+    copy_field
+    delete_field
+    field_equals
+    field_exists
+    move_field
+    update_field
+);
 use Koha::MoreUtils;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 
 use vars qw(@ISA @EXPORT);
 
 BEGIN {
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-        &GetModificationTemplates
-        &AddModificationTemplate
-        &DelModificationTemplate
+      GetModificationTemplates
+      AddModificationTemplate
+      DelModificationTemplate
 
-        &GetModificationTemplateAction
-        &GetModificationTemplateActions
+      GetModificationTemplateAction
+      GetModificationTemplateActions
 
-        &AddModificationTemplateAction
-        &ModModificationTemplateAction
-        &DelModificationTemplateAction
-        &MoveModificationTemplateAction
+      AddModificationTemplateAction
+      ModModificationTemplateAction
+      DelModificationTemplateAction
+      MoveModificationTemplateAction
 
-        &ModifyRecordsWithTemplate
-        &ModifyRecordWithTemplate
+      ModifyRecordsWithTemplate
+      ModifyRecordWithTemplate
     );
 }
 

C4/Matcher.pm

@@ -19,12 +19,17 @@ package C4::Matcher;
 
 use Modern::Perl;
 
-use MARC::Record;
 
 use Koha::SearchEngine;
 use Koha::SearchEngine::Search;
 use Koha::SearchEngine::QueryBuilder;
-use Koha::Util::Normalize qw/legacy_default remove_spaces upper_case lower_case ISBN/;
+use Koha::Util::Normalize qw(
+    ISBN
+    legacy_default
+    lower_case
+    remove_spaces
+    upper_case
+);
 
 =head1 NAME
 

C4/Members.pm

@@ -22,47 +22,41 @@ package C4::Members;
 
 use Modern::Perl;
 use C4::Context;
-use String::Random qw( random_string );
 use Scalar::Util qw( looks_like_number );
-use Date::Calc qw/Today check_date Date_to_Days/;
-use List::MoreUtils qw( uniq );
-use JSON qw(to_json);
-use C4::Log; # logaction
-use C4::Overdues;
+use Date::Calc qw( check_date Date_to_Days );
+use C4::Overdues qw( checkoverdues );
 use C4::Reserves;
 use C4::Accounts;
-use C4::Biblio;
-use C4::Letters;
+use C4::Letters qw( GetPreparedLetter );
 use DateTime;
 use Koha::Database;
-use Koha::DateUtils;
-use Koha::AuthUtils qw(hash_password);
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Database;
 use Koha::Holds;
-use Koha::List::Patron;
 use Koha::News;
 use Koha::Patrons;
 use Koha::Patron::Categories;
 
-our (@ISA,@EXPORT,@EXPORT_OK);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
-    #Get data
-    push @EXPORT, qw(
+    @EXPORT_OK = qw(
+      GetMemberDetails
+      GetMember
 
-        &GetAllIssues
+      GetAllIssues
 
-        &GetBorrowersToExpunge
+      GetBorrowersToExpunge
 
-        &IssueSlip
-    );
+      IssueSlip
+
+      checkuserpassword
+      get_cardnumber_length
+      checkcardnumber
 
-    #Check data
-    push @EXPORT, qw(
-        &checkuserpassword
-        &checkcardnumber
+      DeleteUnverifiedOpacRegistrations
+      DeleteExpiredOpacRegistrations
     );
 }
 

C4/Members/Statistics.pm

@@ -26,16 +26,17 @@ use Modern::Perl;
 
 use C4::Context;
 
-our ( @ISA, @EXPORT, @EXPORT_OK );
+our ( @ISA, @EXPORT_OK );
 
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
 
-    push @EXPORT, qw(
-        &GetTotalIssuesTodayByBorrower
-        &GetTotalIssuesReturnedTodayByBorrower
-        &GetPrecedentStateByBorrower
+    @EXPORT_OK = qw(
+        get_fields
+        GetTotalIssuesTodayByBorrower
+        GetTotalIssuesReturnedTodayByBorrower
+        GetPrecedentStateByBorrower
     );
 }
 

C4/Message.pm

@@ -22,10 +22,10 @@ package C4::Message;
 use strict;
 use warnings;
 use C4::Context;
-use C4::Letters;
-use YAML::XS;
+use C4::Letters qw( GetPreparedLetter EnqueueLetter );
+use YAML::XS qw( Dump );
 use Encode;
-use Carp;
+use Carp qw( carp );
 
 =head1 NAME
 

C4/OAI/Sets.pm

@@ -38,10 +38,10 @@ BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
     @EXPORT = qw(
-        &GetOAISets &GetOAISet &GetOAISetBySpec &ModOAISet &DelOAISet &AddOAISet
-        &GetOAISetsMappings &GetOAISetMappings &ModOAISetMappings
-        &GetOAISetsBiblio &ModOAISetsBiblios &AddOAISetsBiblios
-        &CalcOAISetsBiblio &UpdateOAISetsBiblio &DelOAISetsBiblio
+        GetOAISets GetOAISet GetOAISetBySpec ModOAISet DelOAISet AddOAISet
+        GetOAISetsMappings GetOAISetMappings ModOAISetMappings
+        GetOAISetsBiblio ModOAISetsBiblios AddOAISetsBiblios
+        CalcOAISetsBiblio UpdateOAISetsBiblio DelOAISetsBiblio
     );
 }
 

C4/Output.pm

@@ -30,30 +30,23 @@ use Modern::Perl;
 use URI::Escape;
 use Scalar::Util qw( looks_like_number );
 
-use C4::Auth qw(get_template_and_user);
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
 use C4::Templates;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+our (@ISA, @EXPORT_OK);
 
 BEGIN {
     require Exporter;
 
     @ISA    = qw(Exporter);
-    @EXPORT_OK = qw(&is_ajax ajax_fail); # More stuff should go here instead
-    %EXPORT_TAGS = ( all =>[qw(setlanguagecookie pagination_bar parametrized_url
-                                &output_with_http_headers &output_ajax_with_http_headers &output_html_with_http_headers)],
-                    ajax =>[qw(&output_with_http_headers &output_ajax_with_http_headers is_ajax)],
-                    html =>[qw(&output_with_http_headers &output_html_with_http_headers)]
-                );
-    push @EXPORT, qw(
+    @EXPORT_OK = qw(
+        is_ajax
+        ajax_fail
         setlanguagecookie getlanguagecookie pagination_bar parametrized_url
+        output_html_with_http_headers output_ajax_with_http_headers output_with_http_headers
+        output_and_exit_if_error output_and_exit output_error
     );
-    push @EXPORT, qw(
-        &output_html_with_http_headers &output_ajax_with_http_headers &output_with_http_headers
-        &output_and_exit_if_error &output_and_exit &output_error
-    );
-
 }
 
 =head1 NAME

C4/Output/JSONStream.pm

@@ -39,7 +39,7 @@ This module allows you to build JSON incrementally.
 use strict;
 use warnings;
 
-use JSON;
+use JSON qw( to_json );
 
 sub new {
     my $class = shift;

C4/Overdues.pm

@@ -20,45 +20,38 @@ package C4::Overdues;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-use Date::Calc qw/Today Date_to_Days/;
-use Date::Manip qw/UnixDate/;
+use Date::Calc qw( Today );
+use Date::Manip qw( UnixDate );
 use List::MoreUtils qw( uniq );
-use POSIX qw( floor ceil );
-use Locale::Currency::Format 1.28;
-use Carp;
+use POSIX qw( ceil floor );
+use Locale::Currency::Format 1.28 qw( currency_format FMT_SYMBOL );
+use Carp qw( carp );
 
-use C4::Circulation;
 use C4::Context;
 use C4::Accounts;
-use C4::Log; # logaction
 use Koha::Logger;
-use Koha::DateUtils;
 use Koha::Account::Lines;
 use Koha::Account::Offsets;
 use Koha::Libraries;
 
-use vars qw(@ISA @EXPORT);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
 
     # subs to rename (and maybe merge some...)
-    push @EXPORT, qw(
-      &CalcFine
-      &Getoverdues
-      &checkoverdues
-      &UpdateFine
-      &GetFine
-      &get_chargeable_units
-      &GetOverduesForBranch
-      &GetOverdueMessageTransportTypes
-      &parse_overdues_letter
-    );
-
-    # subs to move to Circulation.pm
-    push @EXPORT, qw(
-      &GetIssuesIteminfo
+    @EXPORT_OK = qw(
+      CalcFine
+      Getoverdues
+      checkoverdues
+      UpdateFine
+      GetFine
+      GetBranchcodesWithOverdueRules
+      get_chargeable_units
+      GetOverduesForBranch
+      GetOverdueMessageTransportTypes
+      parse_overdues_letter
+      GetIssuesIteminfo
     );
 }
 

C4/Patroncards.pm

@@ -16,7 +16,16 @@ BEGIN {
     );
     use C4::Patroncards::Batch;
     use C4::Patroncards::Layout;
-    use C4::Patroncards::Lib;
+    use C4::Patroncards::Lib qw(
+    box
+    get_borrower_attributes
+    get_image
+    leading
+    put_image
+    rm_image
+    text_alignment
+    unpack_UTF8
+);
     use C4::Patroncards::Patroncard;
     use C4::Patroncards::Profile;
     use C4::Patroncards::Template;

C4/Patroncards/Patroncard.pm

@@ -21,12 +21,16 @@ use strict;
 use warnings;
 
 use autouse 'Data::Dumper' => qw(Dumper);
-use Text::Wrap qw(wrap);
 #use Font::TTFMetrics;
 
-use C4::Creators::Lib qw(get_font_types get_unit_values);
+use C4::Creators::Lib qw( get_unit_values );
 use C4::Creators::PDF qw(StrWidth);
-use C4::Patroncards::Lib qw(unpack_UTF8 text_alignment leading box get_borrower_attributes);
+use C4::Patroncards::Lib qw(
+    box
+    get_borrower_attributes
+    leading
+    text_alignment
+);
 
 =head1 NAME
 

C4/Record.pm

@@ -25,20 +25,20 @@ use Modern::Perl;
 use MARC::Record; # marc2marcxml, marcxml2marc, changeEncoding
 use MARC::File::XML; # marc2marcxml, marcxml2marc, changeEncoding
 use Biblio::EndnoteStyle;
-use Unicode::Normalize; # _entity_encode
-use C4::Biblio; #marc2bibtex
+use Unicode::Normalize qw( NFC ); # _entity_encode
+use C4::Biblio qw( GetFrameworkCode GetMarcBiblio );
 use C4::Koha; #marc2csv
-use C4::XSLT ();
+use C4::XSLT;
 use YAML::XS; #marcrecords2csv
 use Encode;
 use Template;
 use Text::CSV::Encoded; #marc2csv
 use Koha::Items;
-use Koha::SimpleMARC qw(read_field);
+use Koha::SimpleMARC qw( read_field );
 use Koha::XSLT::Base;
 use Koha::CsvProfiles;
 use Koha::AuthorisedValues;
-use Carp;
+use Carp qw( carp croak );
 
 use vars qw(@ISA @EXPORT);
 
@@ -48,16 +48,17 @@ use vars qw(@ISA @EXPORT);
 # only export API methods
 
 @EXPORT = qw(
-  &marc2endnote
-  &marc2marc
-  &marc2marcxml
-  &marcxml2marc
-  &marc2dcxml
-  &marc2modsxml
-  &marc2madsxml
-  &marc2bibtex
-  &marc2csv
-  &changeEncoding
+  marc2endnote
+  marc2marc
+  marc2marcxml
+  marcxml2marc
+  marc2dcxml
+  marc2modsxml
+  marc2madsxml
+  marc2bibtex
+  marc2csv
+  marcrecord2csv
+  changeEncoding
 );
 
 =head1 NAME

C4/Reports.pm

@@ -20,13 +20,13 @@ package C4::Reports;
 use Modern::Perl;
 use CGI qw ( -utf8 );
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 use C4::Context;
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
-    @EXPORT = qw(
+    @EXPORT_OK = qw(
         GetDelimiterChoices
     );
 }

C4/Reports/Guided.pm

@@ -19,40 +19,42 @@ package C4::Reports::Guided;
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
-use Carp;
+use Carp qw( carp croak );
 use JSON qw( from_json );
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 use C4::Context;
 use C4::Templates qw/themelanguage/;
-use C4::Koha;
-use Koha::DateUtils;
+use C4::Koha qw( GetAuthorisedValues );
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Patrons;
 use Koha::Reports;
 use C4::Output;
-use C4::Log;
+use C4::Log qw( logaction );
 use Koha::Notice::Templates;
-use C4::Letters;
 
 use Koha::Logger;
 use Koha::AuthorisedValues;
 use Koha::Patron::Categories;
 use Koha::SharedContent;
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
-    @EXPORT = qw(
+    @EXPORT_OK = qw(
       get_report_types get_report_areas get_report_groups get_columns build_query get_criteria
       save_report get_saved_reports execute_query
       get_column_type get_distinct_values save_dictionary get_from_dictionary
-      delete_definition delete_report format_results get_sql
+      delete_definition delete_report store_results format_results get_sql get_results
       nb_rows update_sql
+      strip_limit
+      convert_sql
       GetReservedAuthorisedValues
       GetParametersFromSQL
       IsAuthorisedValueValid
       ValidateSQLParameters
       nb_rows update_sql
+      EmailReport
     );
 }
 

C4/Reserves.pm

@@ -24,12 +24,11 @@ package C4::Reserves;
 use Modern::Perl;
 
 use C4::Accounts;
-use C4::Biblio;
-use C4::Circulation;
+use C4::Circulation qw( CheckIfIssuedToPatron GetAgeRestriction GetBranchItemRule );
 use C4::Context;
-use C4::Items;
+use C4::Items qw( CartToShelf get_hostitemnumbers_of );
 use C4::Letters;
-use C4::Log;
+use C4::Log qw( logaction );
 use C4::Members::Messaging;
 use C4::Members;
 use Koha::Account::Lines;
@@ -37,7 +36,7 @@ use Koha::Biblios;
 use Koha::Calendar;
 use Koha::CirculationRules;
 use Koha::Database;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Hold;
 use Koha::Holds;
 use Koha::ItemTypes;
@@ -47,11 +46,8 @@ use Koha::Old::Hold;
 use Koha::Patrons;
 use Koha::Plugins;
 
-use Carp;
-use Data::Dumper;
-use List::MoreUtils qw( firstidx any );
-
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+use Data::Dumper qw( Dumper );
+use List::MoreUtils qw( any );
 
 =head1 NAME
 
@@ -99,49 +95,57 @@ This modules provides somes functions to deal with reservations.
 
 =cut
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA = qw(Exporter);
-    @EXPORT = qw(
-        &AddReserve
+    @EXPORT_OK = qw(
+      AddReserve
 
-        &GetReserveStatus
+      GetReserveStatus
 
-        &GetOtherReserves
+      GetOtherReserves
+      ChargeReserveFee
+      GetReserveFee
 
-        &ModReserveFill
-        &ModReserveAffect
-        &ModReserve
-        &ModReserveStatus
-        &ModReserveCancelAll
-        &ModReserveMinusPriority
-        &MoveReserve
+      ModReserveFill
+      ModReserveAffect
+      ModReserve
+      ModReserveStatus
+      ModReserveCancelAll
+      ModReserveMinusPriority
+      MoveReserve
 
-        &CheckReserves
-        &CanBookBeReserved
-        &CanItemBeReserved
-        &CanReserveBeCanceledFromOpac
-        &CancelExpiredReserves
+      CheckReserves
+      CanBookBeReserved
+      CanItemBeReserved
+      CanReserveBeCanceledFromOpac
+      CancelExpiredReserves
 
-        &AutoUnsuspendReserves
+      AutoUnsuspendReserves
 
-        &IsAvailableForItemLevelRequest
+      IsAvailableForItemLevelRequest
       ItemsAnyAvailableAndNotRestricted
 
-        &AlterPriority
-        &ToggleLowestPriority
+      AlterPriority
+      ToggleLowestPriority
+
+      ReserveSlip
+      ToggleSuspend
+      SuspendAll
 
-        &ReserveSlip
-        &ToggleSuspend
-        &SuspendAll
+      GetReservesControlBranch
 
-        &GetReservesControlBranch
+      CalculatePriority
 
       IsItemOnHoldAndFound
 
       GetMaxPatronHoldsForRecord
+
+      MergeHolds
+
+      RevertWaitingStatus
     );
-    @EXPORT_OK = qw( MergeHolds );
 }
 
 =head2 AddReserve

C4/Ris.pm

@@ -62,12 +62,12 @@ package C4::Ris;
 
 use Modern::Perl;
 
-use List::MoreUtils qw/uniq/;
+use List::MoreUtils qw( uniq );
 use YAML::XS;
 use Encode;
 use vars qw(@ISA @EXPORT);
 
-use Koha::SimpleMARC qw(read_field);
+use Koha::SimpleMARC qw( read_field );
 
 
 @ISA = qw(Exporter);
@@ -75,7 +75,7 @@ use Koha::SimpleMARC qw(read_field);
 # only export API methods
 
 @EXPORT = qw(
-  &marc2ris
+  marc2ris
 );
 
 our $marcprint = 0; # Debug flag;

C4/RotatingCollections.pm

@@ -25,12 +25,10 @@ package C4::RotatingCollections;
 use Modern::Perl;
 
 use C4::Context;
-use C4::Circulation;
 use C4::Reserves qw(CheckReserves);
 use Koha::Database;
 
-use DBI;
-use Try::Tiny;
+use Try::Tiny qw( catch try );
 
 use vars qw(@ISA @EXPORT);
 
@@ -61,6 +59,8 @@ BEGIN {
       TransferCollection
 
       GetCollectionItemBranches
+      isItemInAnyCollection
+      isItemInThisCollection
     );
 }
 

C4/SIP/ILS.pm

@@ -6,7 +6,7 @@ package C4::SIP::ILS;
 
 use warnings;
 use strict;
-use C4::SIP::Sip qw(siplog);
+use C4::SIP::Sip qw( siplog );
 use Data::Dumper;
 
 use C4::SIP::ILS::Item;

C4/SIP/ILS/Item.pm

@@ -17,11 +17,11 @@ use C4::SIP::ILS::Transaction;
 use C4::SIP::Sip qw(add_field);
 
 use C4::Biblio;
-use C4::Circulation;
+use C4::Circulation qw( barcodedecode );
 use C4::Context;
 use C4::Items;
 use C4::Members;
-use C4::Reserves;
+use C4::Reserves qw( ModReserveFill );
 use Koha::Biblios;
 use Koha::Checkouts::ReturnClaims;
 use Koha::Checkouts;

C4/SIP/ILS/Transaction/Checkin.pm

@@ -11,9 +11,9 @@ use strict;
 
 use C4::SIP::ILS::Transaction;
 
-use C4::Circulation;
+use C4::Circulation qw( AddReturn LostItem );
 use C4::Items qw( ModItemTransfer );
-use C4::Reserves qw( ModReserveAffect );
+use C4::Reserves qw( ModReserve ModReserveAffect );
 use Koha::DateUtils qw( dt_from_string );
 use Koha::Items;
 

C4/SIP/ILS/Transaction/Checkout.pm

@@ -8,14 +8,14 @@ use warnings;
 use strict;
 
 use POSIX qw(strftime);
-use C4::SIP::Sip qw(siplog);
+use C4::SIP::Sip qw( siplog );
 use Data::Dumper;
 use CGI qw ( -utf8 );
 
 use C4::SIP::ILS::Transaction;
 
 use C4::Context;
-use C4::Circulation;
+use C4::Circulation qw( AddIssue GetIssuingCharges CanBookBeIssued );
 use C4::Members;
 use C4::Reserves qw(ModReserveFill);
 use Koha::DateUtils;

C4/SIP/ILS/Transaction/Hold.pm

@@ -7,13 +7,13 @@ use Modern::Perl;
 
 use C4::SIP::ILS::Transaction;
 
-use C4::Reserves;	# AddReserve
+use C4::Reserves qw( CalculatePriority AddReserve ModReserve );
 use Koha::Holds;
 use Koha::Patrons;
-use parent qw(C4::SIP::ILS::Transaction);
-
 use Koha::Items;
 
+use parent qw(C4::SIP::ILS::Transaction);
+
 my %fields = (
 	expiration_date => 0,
 	pickup_location => undef,

C4/SIP/ILS/Transaction/Renew.pm

@@ -7,7 +7,7 @@ package C4::SIP::ILS::Transaction::Renew;
 use warnings;
 use strict;
 
-use C4::Circulation;
+use C4::Circulation qw( CanBookBeRenewed GetIssuingCharges AddIssue );
 use Koha::Patrons;
 use Koha::DateUtils;
 

C4/SIP/ILS/Transaction/RenewAll.pm

@@ -6,7 +6,7 @@ package C4::SIP::ILS::Transaction::RenewAll;
 use strict;
 use warnings;
 
-use C4::SIP::Sip qw(siplog);
+use C4::SIP::Sip qw( siplog );
 
 use C4::SIP::ILS::Item;
 

C4/SIP/SIPServer.pm

@@ -21,8 +21,8 @@ use C4::SIP::Sip::MsgType qw( handle login_core );
 use C4::SIP::Logger qw(set_logger);
 
 use Koha::Caches;
-
 use Koha::Logger;
+
 use C4::SIP::Trapper;
 tie *STDERR, "C4::SIP::Trapper";
 

C4/SIP/Sip.pm

@@ -15,7 +15,7 @@ use List::Util qw(first);
 
 use C4::SIP::Sip::Constants qw(SIP_DATETIME FID_SCREEN_MSG);
 use C4::SIP::Sip::Checksum qw(checksum);
-use C4::SIP::Logger qw(get_logger);
+use C4::SIP::Logger qw( get_logger );
 
 use base qw(Exporter);
 

C4/Scheduler.pm

@@ -19,15 +19,14 @@ package C4::Scheduler;
 
 use Modern::Perl;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 use C4::Context;
 use Schedule::At;
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT =
-		qw(get_jobs get_at_jobs get_at_job add_at_job remove_at_job);
+    @EXPORT_OK = qw(get_jobs get_at_jobs get_at_job add_at_job remove_at_job);
 }
 
 =head1 NAME

C4/Scrubber.pm

@@ -21,7 +21,7 @@ package C4::Scrubber;
 
 use strict;
 use warnings;
-use Carp;
+use Carp qw( croak );
 use HTML::Scrubber;
 
 use C4::Context;

C4/Search.pm

@@ -16,28 +16,44 @@ package C4::Search;
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use Modern::Perl;
-require Exporter;
 use C4::Context;
-use C4::Biblio;    # GetMarcFromKohaField, GetBiblioData
-use C4::Koha;      # getFacets
+use C4::Biblio qw( TransformMarcToKoha GetMarcFromKohaField GetFrameworkCode GetAuthorisedValueDesc GetBiblioData );
+use C4::Koha qw( getFacets GetVariationsOfISBN GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN getitemtypeimagelocation );
 use Koha::DateUtils;
 use Koha::Libraries;
 use Lingua::Stem;
 use XML::Simple;
-use C4::XSLT;
-use C4::Reserves;    # GetReserveStatus
-use C4::Charset;
-use Koha::Logger;
+use C4::XSLT qw( XSLTParse4Display );
+use C4::Reserves qw( GetReserveStatus );
+use C4::Charset qw( SetUTF8Flag );
 use Koha::AuthorisedValues;
 use Koha::ItemTypes;
 use Koha::Libraries;
+use Koha::Logger;
 use Koha::Patrons;
 use Koha::RecordProcessor;
 use URI::Escape;
 use Business::ISBN;
 use MARC::Record;
 use MARC::Field;
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+
+our (@ISA, @EXPORT_OK);
+BEGIN {
+    require Exporter;
+    @ISA    = qw(Exporter);
+    @EXPORT_OK = qw(
+      FindDuplicate
+      SimpleSearch
+      searchResults
+      getRecords
+      buildQuery
+      GetDistinctValues
+      enabled_staff_search_views
+      new_record_from_zebra
+      z3950_search_args
+      getIndexes
+    );
+}
 
 =head1 NAME
 
@@ -55,17 +71,6 @@ This module provides searching functions for Koha's bibliographic databases
 
 =cut
 
-@ISA    = qw(Exporter);
-@EXPORT = qw(
-  &FindDuplicate
-  &SimpleSearch
-  &searchResults
-  &getRecords
-  &buildQuery
-  &GetDistinctValues
-  &enabled_staff_search_views
-);
-
 # make all your functions, whether exported or not;
 
 =head2 FindDuplicate

C4/Search/History.pm

@@ -4,11 +4,10 @@ use Modern::Perl;
 
 use C4::Auth qw( get_session );
 use C4::Context;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 
-use JSON qw( encode_json decode_json );
-use URI::Escape;
-use Encode;
+use JSON qw( decode_json encode_json );
+use URI::Escape qw( uri_escape uri_unescape );
 
 sub add {
     my ($params)   = @_;

C4/Search/PazPar2.pm

@@ -22,7 +22,7 @@ use Modern::Perl;
 use LWP::UserAgent;
 use URI;
 use URI::QueryParam;
-use XML::Simple;
+use XML::Simple qw( XMLin );
 
 =head1 NAME
 

C4/Serials.pm

@@ -20,25 +20,30 @@ package C4::Serials;
 
 use Modern::Perl;
 
-use C4::Auth qw(haspermission);
+use C4::Auth qw( haspermission );
 use C4::Context;
 use DateTime;
-use Date::Calc qw(:all);
-use POSIX qw(strftime);
-use C4::Biblio;
-use C4::Log;    # logaction
-use C4::Serials::Frequency;
+use Date::Calc qw(
+    Add_Delta_Days
+    Add_Delta_YM
+    check_date
+    Delta_Days
+    N_Delta_YMD
+    Today
+);
+use POSIX qw( strftime );
+use C4::Biblio qw( GetMarcBiblio GetMarcFromKohaField ModBiblio );
+use C4::Log qw( logaction );    # logaction
+use C4::Serials::Frequency qw( GetSubscriptionFrequency );
 use C4::Serials::Numberpattern;
 use Koha::AdditionalFieldValues;
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string output_pref );
 use Koha::Serial;
 use Koha::Subscriptions;
 use Koha::Subscription::Histories;
 use Koha::SharedContent;
 use Scalar::Util qw( looks_like_number );
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
 # Define statuses
 use constant {
     EXPECTED               => 1,
@@ -61,31 +66,39 @@ use constant MISSING_STATUSES => (
     MISSING_LOST
 );
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
-    @EXPORT = qw(
-      &NewSubscription    &ModSubscription    &DelSubscription
-      &GetSubscription    &CountSubscriptionFromBiblionumber      &GetSubscriptionsFromBiblionumber
-      &SearchSubscriptions
-      &GetFullSubscriptionsFromBiblionumber   &GetFullSubscription &ModSubscriptionHistory
-      &HasSubscriptionStrictlyExpired &HasSubscriptionExpired &GetExpirationDate &abouttoexpire
-      &GetSubscriptionHistoryFromSubscriptionId
-
-      &GetNextSeq &GetSeq &NewIssue           &GetSerials
-      &GetLatestSerials   &ModSerialStatus    &GetNextDate       &GetSerials2
-      &GetSubscriptionLength &ReNewSubscription  &GetLateOrMissingIssues
-      &GetSerialInformation                   &AddItem2Serial
-      &PrepareSerialsData &GetNextExpected    &ModNextExpected
-      &GetPreviousSerialid
-
-      &GetSuppliersWithLateIssues
-      &getroutinglist     &delroutingmember   &addroutingmember
-      &reorder_members
-      &check_routing &updateClaim
-      &CountIssues
+    @EXPORT_OK = qw(
+      NewSubscription    ModSubscription    DelSubscription
+      GetSubscription    CountSubscriptionFromBiblionumber      GetSubscriptionsFromBiblionumber
+      SearchSubscriptions
+      GetFullSubscriptionsFromBiblionumber   GetFullSubscription ModSubscriptionHistory
+      HasSubscriptionStrictlyExpired HasSubscriptionExpired GetExpirationDate abouttoexpire
+      GetFictiveIssueNumber
+      GetSubscriptionHistoryFromSubscriptionId
+
+      GetNextSeq GetSeq NewIssue           GetSerials
+      GetLatestSerials   ModSerialStatus    GetNextDate
+      CloseSubscription ReopenSubscription
+      subscriptionCurrentlyOnOrder
+      can_claim_subscription can_edit_subscription can_show_subscription
+      GetSerials2
+      GetSubscriptionLength ReNewSubscription  GetLateOrMissingIssues
+      GetSerialInformation                   AddItem2Serial
+      PrepareSerialsData GetNextExpected    ModNextExpected
+      GetSubscriptionIrregularities
+      GetPreviousSerialid
+
+      GetSuppliersWithLateIssues
+      getroutinglist     delroutingmember   addroutingmember
+      reorder_members
+      check_routing updateClaim
+      CountIssues
       HasItems
-      &subscriptionCurrentlyOnOrder
+
+      findSerialsByStatus
 
     );
 }

C4/Serials/Frequency.pm

@@ -28,13 +28,13 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-      &GetSubscriptionFrequencies
-      &GetSubscriptionFrequency
-      &AddSubscriptionFrequency
-      &ModSubscriptionFrequency
-      &DelSubscriptionFrequency
+      GetSubscriptionFrequencies
+      GetSubscriptionFrequency
+      AddSubscriptionFrequency
+      ModSubscriptionFrequency
+      DelSubscriptionFrequency
 
-      &GetSubscriptionsWithFrequency
+      GetSubscriptionsWithFrequency
     );
 }
 

C4/Serials/Numberpattern.pm

@@ -29,14 +29,14 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-        &GetSubscriptionNumberpatterns
-        &GetSubscriptionNumberpattern
-        &GetSubscriptionNumberpatternByName
-        &AddSubscriptionNumberpattern
-        &ModSubscriptionNumberpattern
-        &DelSubscriptionNumberpattern
-
-        &GetSubscriptionsWithNumberpattern
+        GetSubscriptionNumberpatterns
+        GetSubscriptionNumberpattern
+        GetSubscriptionNumberpatternByName
+        AddSubscriptionNumberpattern
+        ModSubscriptionNumberpattern
+        DelSubscriptionNumberpattern
+
+        GetSubscriptionsWithNumberpattern
     );
 }
 

C4/Service.pm

@@ -43,7 +43,7 @@ use warnings;
 
 use CGI qw ( -utf8 );
 use C4::Auth qw( check_api_auth );
-use C4::Output qw( :ajax );
+use C4::Output qw( output_with_http_headers );
 use C4::Output::JSONStream;
 use JSON;
 

C4/ShelfBrowser.pm

@@ -20,21 +20,18 @@ package C4::ShelfBrowser;
 use strict;
 use warnings;
 
-use C4::Biblio;
+use C4::Biblio qw( GetAuthorisedValueDesc GetMarcBiblio );
 use C4::Context;
-use C4::Koha;
+use C4::Koha qw( GetNormalizedUPC GetNormalizedOCLCNumber GetNormalizedISBN GetNormalizedEAN );
 use Koha::Biblios;
 use Koha::Libraries;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     require Exporter;
     @ISA       = qw(Exporter);
-	@EXPORT = qw(
-	    &GetNearbyItems
-    );
     @EXPORT_OK = qw(
+      GetNearbyItems
     );
 }
 

C4/SocialData.pm

@@ -19,7 +19,7 @@ use Modern::Perl;
 
 use C4::Context;
 use Business::ISBN;
-use C4::Koha;
+use C4::Koha qw( GetNormalizedISBN );
 
 =head1 NAME
 

C4/Stats.pm

@@ -20,7 +20,7 @@ package C4::Stats;
 
 use Modern::Perl;
 require Exporter;
-use Carp;
+use Carp qw( croak );
 use C4::Context;
 
 use Koha::DateUtils qw( dt_from_string );
@@ -32,7 +32,7 @@ use vars qw(@ISA @EXPORT);
 BEGIN {
     @ISA    = qw(Exporter);
     @EXPORT = qw(
-		&UpdateStats
+      UpdateStats
     );
 }
 

C4/Suggestions.pm

@@ -25,10 +25,9 @@ use C4::Context;
 use C4::Output;
 use C4::Letters;
 use C4::Biblio qw( GetMarcFromKohaField );
-use Koha::DateUtils;
+use Koha::DateUtils qw( dt_from_string );
 use Koha::Suggestions;
 
-use List::MoreUtils qw(any);
 use base qw(Exporter);
 
 our @EXPORT  = qw(

C4/Tags.pm

@@ -20,35 +20,36 @@ package C4::Tags;
 
 use strict;
 use warnings;
-use Carp;
+use Carp qw( carp );
 use Exporter;
 
 use C4::Context;
-use Module::Load::Conditional qw/check_install/;
+use Module::Load::Conditional qw( check_install );
 #use Data::Dumper;
 use constant TAG_FIELDS => qw(tag_id borrowernumber biblionumber term language date_created);
 use constant TAG_SELECT => "SELECT " . join(',', TAG_FIELDS) . "\n FROM   tags_all\n";
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
+our (@ISA, @EXPORT_OK);
 BEGIN {
     @ISA       = qw(Exporter);
     @EXPORT_OK = qw(
-      &get_tag &get_tags &get_tag_rows
-      &add_tags &add_tag
-      &delete_tag_row_by_id
-      &remove_tag
-      &delete_tag_rows_by_ids
-      &get_approval_rows
-      &blacklist
-      &whitelist
-      &is_approved
-      &approval_counts
-      &get_count_by_tag_status
-      &get_filters
+      get_tag get_tags get_tag_rows
+      add_tags
+      add_tag
+      add_tag_approval
+      add_tag_index
+      delete_tag_row_by_id
+      remove_tag
+      delete_tag_rows_by_ids
+      get_approval_rows
+      blacklist
+      whitelist
+      is_approved
+      approval_counts
+      get_count_by_tag_status
+      get_filters
       stratify_tags
     );
-	# %EXPORT_TAGS = ();
     my $ext_dict = C4::Context->preference('TagsExternalDictionary');
     if ( $ext_dict && ! check_install( module => 'Lingua::Ispell' ) ) {
         warn "Ignoring TagsExternalDictionary, because Lingua::Ispell is not installed.";

C4/Templates.pm

@@ -2,9 +2,9 @@ package C4::Templates;
 
 use strict;
 use warnings;
-use Carp;
+use Carp qw( carp );
 use CGI qw ( -utf8 );
-use List::MoreUtils qw/ any uniq /;
+use List::MoreUtils qw( uniq );
 
 # Copyright 2009 Chris Cormack and The Koha Dev Team
 #
@@ -31,8 +31,7 @@ C4::Templates - Object for manipulating templates for use with Koha
 
 use base qw(Class::Accessor);
 use Template;
-use Template::Constants qw( :debug );
-use C4::Languages qw(getTranslatedLanguages get_bidi regex_lang_subtags language_get_description accept_language );
+use C4::Languages qw( get_bidi getTranslatedLanguages regex_lang_subtags );
 
 use C4::Context;
 

C4/TmplTokenType.pm

@@ -20,8 +20,6 @@ package C4::TmplTokenType;
 use Modern::Perl;
 require Exporter;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-
 ###############################################################################
 
 =head1 NAME
@@ -38,25 +36,28 @@ The predefined constants are
 ###############################################################################
 
 
-@ISA = qw(Exporter);
-@EXPORT_OK = qw(
-    &TEXT
-    &TEXT_PARAMETRIZED
-    &CDATA
-    &TAG
-    &DECL
-    &PI
-    &DIRECTIVE
-    &COMMENT
-    &UNKNOWN
-);
-
 ###############################################################################
 
 use vars qw( $_text $_text_parametrized $_cdata
     $_tag $_decl $_pi $_directive $_comment $_null $_unknown );
 
+our (@ISA, @EXPORT_OK);
 BEGIN {
+
+    require Exporter;
+    @ISA = qw(Exporter);
+    @EXPORT_OK = qw(
+      TEXT
+      TEXT_PARAMETRIZED
+      CDATA
+      TAG
+      DECL
+      PI
+      DIRECTIVE
+      COMMENT
+      UNKNOWN
+    );
+
     my $new = sub {
 	my $this = 'C4::TmplTokenType';#shift;
 	my $class = ref($this) || $this;