Bugzilla – Attachment 121310 Details for
Bug 17600
Standardize the EXPORT
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17600: After export.pl
Bug-17600-After-exportpl.patch (text/plain), 362.70 KB, created by
Jonathan Druart
on 2021-05-24 08:40:17 UTC
(
hide
)
Description:
Bug 17600: After export.pl
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2021-05-24 08:40:17 UTC
Size:
362.70 KB
patch
obsolete
>From b2eb0d6a00f7ba489077475178480554ea30e17f Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 21 May 2021 16:55:41 +0200 >Subject: [PATCH] Bug 17600: After export.pl > >--- > C4/Acquisition.pm | 4 +-- > C4/Auth.pm | 6 ++--- > C4/Auth_with_cas.pm | 2 +- > C4/Auth_with_ldap.pm | 4 +-- > C4/Auth_with_shibboleth.pm | 2 +- > C4/AuthoritiesMarc.pm | 6 ++--- > C4/BackgroundJob.pm | 2 +- > C4/Biblio.pm | 4 +-- > C4/Breeding.pm | 10 +++---- > C4/Circulation.pm | 8 +++--- > C4/ClassSortRoutine/Dewey.pm | 2 +- > C4/ClassSortRoutine/Generic.pm | 2 +- > C4/ClassSortRoutine/LCC.pm | 2 +- > C4/CourseReserves.pm | 2 +- > C4/HoldsQueue.pm | 4 +-- > C4/ILSDI/Services.pm | 12 ++++----- > C4/ImportBatch.pm | 8 +++--- > C4/InstallAuth.pm | 2 +- > C4/Items.pm | 4 +-- > C4/Labels/Label.pm | 2 +- > C4/MarcModificationTemplates.pm | 2 +- > C4/Members.pm | 4 +-- > C4/Message.pm | 2 +- > C4/Output.pm | 2 +- > C4/Record.pm | 4 +-- > C4/Reports/Guided.pm | 2 +- > C4/Reserves.pm | 6 ++--- > C4/Ris.pm | 2 +- > C4/SIP/ILS.pm | 2 +- > C4/SIP/SIPServer.pm | 12 ++++----- > C4/SIP/Sip.pm | 2 +- > C4/Search.pm | 8 +++--- > C4/Serials.pm | 4 +-- > C4/Service.pm | 4 +-- > C4/ShelfBrowser.pm | 4 +-- > C4/SocialData.pm | 2 +- > C4/Suggestions.pm | 2 +- > C4/Templates.pm | 2 +- > C4/TmplToken.pm | 2 +- > C4/XISBN.pm | 6 ++--- > C4/XSLT.pm | 6 ++--- > Koha/Account.pm | 2 +- > Koha/Account/Line.pm | 2 +- > Koha/Acquisition/Order.pm | 2 +- > Koha/BackgroundJob/BatchUpdateBiblio.pm | 2 +- > Koha/Biblio.pm | 2 +- > Koha/BiblioUtils.pm | 2 +- > Koha/BiblioUtils/Iterator.pm | 2 +- > Koha/Checkout.pm | 2 +- > Koha/Checkouts.pm | 2 +- > Koha/EDI.pm | 2 +- > Koha/Exporter/Record.pm | 2 +- > Koha/ExternalContent.pm | 2 +- > Koha/Hold.pm | 2 +- > Koha/I18N.pm | 2 +- > Koha/Illrequest.pm | 4 +-- > Koha/Illrequest/Logger.pm | 2 +- > Koha/Item.pm | 6 ++--- > Koha/Item/Transfer.pm | 2 +- > Koha/ItemType.pm | 4 +-- > Koha/ItemTypes.pm | 2 +- > Koha/MetaSearcher.pm | 2 +- > Koha/MetadataRecord.pm | 2 +- > Koha/MetadataRecord/Authority.pm | 2 +- > Koha/Patron.pm | 2 +- > Koha/Patron/Discharge.pm | 2 +- > Koha/Patrons/Import.pm | 2 +- > Koha/Plugins/Base.pm | 2 +- > Koha/SearchEngine/Search.pm | 2 +- > Koha/UploadedFiles.pm | 2 +- > Koha/Virtualshelf.pm | 2 +- > Koha/Z3950Responder/Session.pm | 2 +- > about.pl | 6 ++--- > acqui/acqui-home.pl | 4 +-- > acqui/add_user_search.pl | 4 +-- > acqui/addorder.pl | 8 +++--- > acqui/addorderiso2709.pl | 12 ++++----- > acqui/ajax-getauthvaluedropbox.pl | 4 +-- > acqui/basket.pl | 10 +++---- > acqui/basketgroup.pl | 6 ++--- > acqui/basketheader.pl | 4 +-- > acqui/booksellers.pl | 4 +-- > acqui/cancelorder.pl | 4 +-- > acqui/check_budget_total.pl | 4 +-- > acqui/check_uniqueness.pl | 4 +-- > acqui/duplicate_orders.pl | 4 +-- > acqui/edi_ean.pl | 4 +-- > acqui/edifactmsgs.pl | 6 ++--- > acqui/edimsg.pl | 4 +-- > acqui/finishreceive.pl | 6 ++--- > acqui/histsearch.pl | 4 +-- > acqui/invoice-files.pl | 4 +-- > acqui/invoice.pl | 4 +-- > acqui/invoices.pl | 4 +-- > acqui/lateorders-export.pl | 2 +- > acqui/lateorders.pl | 6 ++--- > acqui/modordernotes.pl | 4 +-- > acqui/neworderempty.pl | 12 ++++----- > acqui/newordersubscription.pl | 6 ++--- > acqui/newordersuggestion.pl | 4 +-- > acqui/ordered.pl | 4 +-- > acqui/orderreceive.pl | 8 +++--- > acqui/parcel.pl | 6 ++--- > acqui/parcels.pl | 4 +-- > acqui/showorder.pl | 4 +-- > acqui/spent.pl | 4 +-- > acqui/supplier.pl | 4 +-- > acqui/transferorder.pl | 4 +-- > acqui/uncertainprice.pl | 4 +-- > acqui/updatesupplier.pl | 2 +- > acqui/z3950_search.pl | 6 ++--- > admin/add_user_search.pl | 4 +-- > admin/additional-fields.pl | 4 +-- > admin/admin-home.pl | 4 +-- > admin/adveditorshortcuts.pl | 4 +-- > admin/aqbudgetperiods.pl | 4 +-- > admin/aqbudgets.pl | 6 ++--- > admin/aqcontract.pl | 4 +-- > admin/aqplan.pl | 4 +-- > admin/audio_alerts.pl | 4 +-- > admin/auth_subfields_structure.pl | 4 +-- > admin/auth_tag_structure.pl | 4 +-- > admin/authorised_values.pl | 6 ++--- > admin/authtypes.pl | 4 +-- > admin/background_jobs.pl | 4 +-- > admin/biblio_framework.pl | 4 +-- > admin/branch_transfer_limits.pl | 6 ++--- > admin/branches.pl | 4 +-- > admin/cash_registers.pl | 4 +-- > admin/categories.pl | 4 +-- > admin/check_budget_parent.pl | 4 +-- > admin/check_parent_total.pl | 4 +-- > admin/checkmarc.pl | 4 +-- > admin/cities.pl | 4 +-- > admin/classsources.pl | 8 +++--- > admin/clone-rules.pl | 4 +-- > admin/columns_settings.pl | 4 +-- > admin/credit_types.pl | 4 +-- > admin/currency.pl | 4 +-- > admin/debit_types.pl | 4 +-- > admin/desks.pl | 4 +-- > admin/didyoumean.pl | 4 +-- > admin/edi_accounts.pl | 4 +-- > admin/edi_ean_accounts.pl | 4 +-- > admin/import_export_framework.pl | 4 +-- > admin/item_circulation_alerts.pl | 4 +-- > admin/items_search_field.pl | 4 +-- > admin/items_search_fields.pl | 4 +-- > admin/itemtypes.pl | 6 ++--- > admin/koha2marclinks.pl | 4 +-- > admin/library_groups.pl | 4 +-- > admin/localization.pl | 4 +-- > admin/marc_subfields_structure.pl | 4 +-- > admin/marctagstructure.pl | 4 +-- > admin/matching-rules.pl | 4 +-- > admin/oai_set_mappings.pl | 4 +-- > admin/oai_sets.pl | 4 +-- > admin/overdrive.pl | 4 +-- > admin/patron-attr-types.pl | 4 +-- > admin/preferences.pl | 10 +++---- > admin/share_content.pl | 4 +-- > admin/smart-rules.pl | 4 +-- > admin/sms_providers.pl | 4 +-- > admin/smtp_servers.pl | 4 +-- > admin/sru_modmapping.pl | 4 +-- > admin/systempreferences.pl | 10 +++---- > admin/transfer_limits.pl | 4 +-- > admin/transport-cost-matrix.pl | 6 ++--- > admin/usage_statistics.pl | 4 +-- > admin/z3950servers.pl | 4 +-- > authorities/auth_finder.pl | 4 +-- > authorities/authorities-home.pl | 6 ++--- > authorities/authorities.pl | 10 +++---- > authorities/blinddetail-biblio-search.pl | 6 ++--- > authorities/detail-biblio-search.pl | 6 ++--- > authorities/detail.pl | 8 +++--- > authorities/export.pl | 4 +-- > authorities/merge.pl | 8 +++--- > authorities/merge_ajax.pl | 4 +-- > authorities/ysearch.pl | 6 ++--- > basket/basket.pl | 8 +++--- > basket/downloadcart.pl | 6 ++--- > basket/sendbasket.pl | 8 +++--- > catalogue/ISBDdetail.pl | 12 ++++----- > catalogue/MARCdetail.pl | 14 +++++----- > catalogue/detail.pl | 24 ++++++++--------- > catalogue/export.pl | 4 +-- > catalogue/getitem-ajax.pl | 6 ++--- > catalogue/imageviewer.pl | 8 +++--- > catalogue/issuehistory.pl | 8 +++--- > catalogue/item-export.pl | 2 +- > catalogue/itemsearch.pl | 8 +++--- > catalogue/labeledMARCdetail.pl | 12 ++++----- > catalogue/moredetail.pl | 14 +++++----- > catalogue/search-history.pl | 4 +-- > catalogue/search.pl | 12 ++++----- > catalogue/showmarc.pl | 8 +++--- > catalogue/stockrotation.pl | 10 +++---- > catalogue/updateitem.pl | 4 +-- > cataloguing/addbiblio.pl | 16 ++++++------ > cataloguing/addbooks.pl | 12 ++++----- > cataloguing/additem.pl | 16 ++++++------ > cataloguing/editor.pl | 4 +-- > cataloguing/linkitem.pl | 8 +++--- > cataloguing/merge.pl | 12 ++++----- > cataloguing/merge_ajax.pl | 4 +-- > cataloguing/moveitem.pl | 6 ++--- > cataloguing/value_builder/EXAMPLE.pl | 4 +-- > cataloguing/value_builder/barcode.pl | 2 +- > cataloguing/value_builder/barcode_manual.pl | 2 +- > cataloguing/value_builder/callnumber-KU.pl | 4 +-- > cataloguing/value_builder/callnumber.pl | 4 +-- > cataloguing/value_builder/cn_browser.pl | 6 ++--- > cataloguing/value_builder/macles.pl | 4 +-- > cataloguing/value_builder/marc21_field_006.pl | 4 +-- > cataloguing/value_builder/marc21_field_007.pl | 4 +-- > cataloguing/value_builder/marc21_field_008.pl | 4 +-- > .../marc21_field_008_authorities.pl | 4 +-- > .../marc21_field_008_classifications.pl | 4 +-- > cataloguing/value_builder/marc21_leader.pl | 4 +-- > .../marc21_leader_authorities.pl | 4 +-- > .../value_builder/marc21_linking_section.pl | 10 +++---- > .../value_builder/normarc_field_007.pl | 4 +-- > .../value_builder/normarc_field_008.pl | 4 +-- > cataloguing/value_builder/normarc_leader.pl | 4 +-- > cataloguing/value_builder/stocknumberAV.pl | 4 +-- > cataloguing/value_builder/stocknumberam123.pl | 4 +-- > .../value_builder/unimarc_field_010.pl | 4 +-- > .../value_builder/unimarc_field_100.pl | 4 +-- > .../unimarc_field_100_authorities.pl | 4 +-- > .../value_builder/unimarc_field_105.pl | 4 +-- > .../value_builder/unimarc_field_106.pl | 4 +-- > .../value_builder/unimarc_field_110.pl | 4 +-- > .../value_builder/unimarc_field_115a.pl | 4 +-- > .../value_builder/unimarc_field_115b.pl | 4 +-- > .../value_builder/unimarc_field_116.pl | 4 +-- > .../value_builder/unimarc_field_117.pl | 4 +-- > .../value_builder/unimarc_field_120.pl | 4 +-- > .../value_builder/unimarc_field_121a.pl | 4 +-- > .../value_builder/unimarc_field_121b.pl | 4 +-- > .../value_builder/unimarc_field_122.pl | 4 +-- > .../value_builder/unimarc_field_123a.pl | 4 +-- > .../value_builder/unimarc_field_123d.pl | 4 +-- > .../value_builder/unimarc_field_123e.pl | 4 +-- > .../value_builder/unimarc_field_123f.pl | 4 +-- > .../value_builder/unimarc_field_123g.pl | 4 +-- > .../value_builder/unimarc_field_123i.pl | 4 +-- > .../value_builder/unimarc_field_123j.pl | 4 +-- > .../value_builder/unimarc_field_124.pl | 4 +-- > .../value_builder/unimarc_field_124a.pl | 4 +-- > .../value_builder/unimarc_field_124b.pl | 4 +-- > .../value_builder/unimarc_field_124c.pl | 4 +-- > .../value_builder/unimarc_field_124d.pl | 4 +-- > .../value_builder/unimarc_field_124e.pl | 4 +-- > .../value_builder/unimarc_field_124f.pl | 4 +-- > .../value_builder/unimarc_field_124g.pl | 4 +-- > .../value_builder/unimarc_field_125.pl | 4 +-- > .../value_builder/unimarc_field_125a.pl | 4 +-- > .../value_builder/unimarc_field_125b.pl | 4 +-- > .../value_builder/unimarc_field_126.pl | 4 +-- > .../value_builder/unimarc_field_126a.pl | 4 +-- > .../value_builder/unimarc_field_126b.pl | 4 +-- > .../value_builder/unimarc_field_127.pl | 4 +-- > .../value_builder/unimarc_field_128a.pl | 4 +-- > .../value_builder/unimarc_field_128b.pl | 4 +-- > .../value_builder/unimarc_field_128c.pl | 4 +-- > .../value_builder/unimarc_field_130.pl | 4 +-- > .../value_builder/unimarc_field_135a.pl | 4 +-- > .../value_builder/unimarc_field_140.pl | 4 +-- > .../value_builder/unimarc_field_141.pl | 4 +-- > .../value_builder/unimarc_field_210c.pl | 8 +++--- > .../value_builder/unimarc_field_210c_bis.pl | 6 ++--- > .../value_builder/unimarc_field_225a.pl | 6 ++--- > .../value_builder/unimarc_field_225a_bis.pl | 4 +-- > .../value_builder/unimarc_field_4XX.pl | 10 +++---- > .../value_builder/unimarc_field_686a.pl | 4 +-- > .../value_builder/unimarc_field_700-4.pl | 4 +-- > cataloguing/value_builder/unimarc_leader.pl | 4 +-- > cataloguing/ysearch.pl | 4 +-- > cataloguing/z3950_auth_search.pl | 6 ++--- > cataloguing/z3950_search.pl | 6 ++--- > circ/add_message.pl | 2 +- > circ/article-request-slip.pl | 6 ++--- > circ/article-requests.pl | 4 +-- > circ/bookcount.pl | 4 +-- > circ/branchoverdues.pl | 10 +++---- > circ/branchtransfers.pl | 8 +++--- > circ/checkout-notes.pl | 4 +-- > circ/circulation-home.pl | 4 +-- > circ/circulation.pl | 10 +++---- > circ/del_message.pl | 2 +- > circ/hold-transfer-slip.pl | 6 ++--- > circ/offline-mf.pl | 2 +- > circ/offline.pl | 4 +-- > circ/on-site_checkouts.pl | 4 +-- > circ/overdue.pl | 4 +-- > circ/pendingreserves.pl | 4 +-- > circ/renew.pl | 6 ++--- > circ/request-article.pl | 8 +++--- > circ/reserveratios.pl | 4 +-- > circ/returns.pl | 16 ++++++------ > circ/set-library.pl | 4 +-- > circ/transfer-slip.pl | 6 ++--- > circ/transfers_to_send.pl | 4 +-- > circ/transferstoreceive.pl | 6 ++--- > circ/view_holdsqueue.pl | 6 ++--- > circ/waitingreserves.pl | 8 +++--- > circ/ysearch.pl | 2 +- > clubs/club-enrollments.pl | 4 +-- > clubs/clubs-add-modify.pl | 4 +-- > clubs/clubs.pl | 4 +-- > clubs/patron-clubs-tab.pl | 4 +-- > clubs/patron-enroll.pl | 4 +-- > clubs/templates-add-modify.pl | 4 +-- > course_reserves/add_items.pl | 8 +++--- > course_reserves/batch_add_items.pl | 6 ++--- > course_reserves/batch_rm_items.pl | 6 ++--- > course_reserves/course-details.pl | 6 ++--- > course_reserves/course-reserves.pl | 6 ++--- > course_reserves/course.pl | 8 +++--- > course_reserves/mod_course.pl | 4 +-- > errors/400.pl | 4 +-- > errors/401.pl | 4 +-- > errors/402.pl | 4 +-- > errors/403.pl | 4 +-- > errors/404.pl | 4 +-- > errors/500.pl | 4 +-- > help.pl | 2 +- > ill/ill-requests.pl | 4 +-- > installer/install.pl | 6 ++--- > installer/onboarding.pl | 6 ++--- > labels/label-create-pdf.pl | 2 +- > labels/label-edit-batch.pl | 4 +-- > labels/label-edit-layout.pl | 4 +-- > labels/label-edit-profile.pl | 4 +-- > labels/label-edit-range.pl | 4 +-- > labels/label-edit-template.pl | 4 +-- > labels/label-home.pl | 4 +-- > labels/label-item-search.pl | 8 +++--- > labels/label-manage.pl | 4 +-- > labels/label-print.pl | 4 +-- > labels/spinelabel-home.pl | 4 +-- > labels/spinelabel-print.pl | 4 +-- > mainpage.pl | 6 ++--- > members/accountline-details.pl | 4 +-- > members/apikeys.pl | 4 +-- > members/boraccount.pl | 4 +-- > members/cancel-charge.pl | 2 +- > members/deletemem.pl | 4 +-- > members/discharge.pl | 4 +-- > members/discharges.pl | 4 +-- > members/files.pl | 4 +-- > members/guarantor_search.pl | 4 +-- > members/holdshistory.pl | 4 +-- > members/housebound.pl | 4 +-- > members/ill-requests.pl | 4 +-- > members/mancredit.pl | 4 +-- > members/maninvoice.pl | 4 +-- > members/member-flags.pl | 6 ++--- > members/member-password.pl | 4 +-- > members/member.pl | 4 +-- > members/memberentry.pl | 12 ++++----- > members/members-home.pl | 4 +-- > members/members-update-do.pl | 2 +- > members/members-update.pl | 4 +-- > members/merge-patrons.pl | 4 +-- > members/mod_debarment.pl | 2 +- > members/moremember.pl | 4 +-- > members/notices.pl | 6 ++--- > members/pay.pl | 4 +-- > members/paycollect.pl | 4 +-- > members/print_overdues.pl | 6 ++--- > members/printfeercpt.pl | 6 ++--- > members/printinvoice.pl | 6 ++--- > members/printslip.pl | 6 ++--- > members/purchase-suggestions.pl | 4 +-- > members/readingrec.pl | 6 ++--- > members/routing-lists.pl | 4 +-- > members/setstatus.pl | 2 +- > members/statistics.pl | 6 ++--- > members/summary-print.pl | 6 ++--- > members/update-child.pl | 4 +-- > misc/add_date_fields_to_marc_records.pl | 2 +- > misc/batchDeleteUnusedSubfields.pl | 2 +- > misc/batchImportMARCWithBiblionumbers.pl | 2 +- > misc/batchRebuildBiblioTables.pl | 4 +-- > misc/batchRebuildItemsTables.pl | 4 +-- > misc/batchRepairMissingBiblionumbers.pl | 2 +- > misc/batchdeletebiblios.pl | 2 +- > misc/commit_file.pl | 2 +- > misc/cronjobs/advance_notices.pl | 2 +- > misc/cronjobs/archive_purchase_suggestions.pl | 2 +- > .../automatic_item_modification_by_age.pl | 2 +- > misc/cronjobs/automatic_renewals.pl | 4 +-- > misc/cronjobs/build_browser_and_cloud.pl | 2 +- > misc/cronjobs/cart_to_shelf.pl | 2 +- > misc/cronjobs/check-url-quick.pl | 2 +- > misc/cronjobs/delete_items.pl | 2 +- > misc/cronjobs/delete_patrons.pl | 2 +- > misc/cronjobs/delete_records_via_leader.pl | 2 +- > misc/cronjobs/edi_cron.pl | 2 +- > misc/cronjobs/fines.pl | 2 +- > misc/cronjobs/gather_print_notices.pl | 2 +- > misc/cronjobs/import_webservice_batch.pl | 2 +- > misc/cronjobs/longoverdue.pl | 4 +-- > misc/cronjobs/membership_expiry.pl | 2 +- > misc/cronjobs/overdue_notices.pl | 4 +-- > misc/cronjobs/patron_emailer.pl | 2 +- > misc/cronjobs/process_message_queue.pl | 2 +- > misc/cronjobs/runreport.pl | 2 +- > misc/cronjobs/serialsUpdate.pl | 4 +-- > misc/cronjobs/staticfines.pl | 2 +- > misc/cronjobs/stockrotation.pl | 2 +- > misc/cronjobs/update_totalissues.pl | 2 +- > misc/devel/get_prepared_letter.pl | 2 +- > misc/link_bibs_to_authorities.pl | 2 +- > ...MARC_sync_date_created_with_marc_biblio.pl | 2 +- > misc/maintenance/fix_tags_weight.pl | 2 +- > .../process_record_through_filter.pl | 2 +- > .../remove_items_from_biblioitems.pl | 2 +- > misc/maintenance/sanitize_records.pl | 2 +- > .../search_for_data_inconsistencies.pl | 2 +- > misc/maintenance/touch_all_biblios.pl | 2 +- > misc/maintenance/touch_all_items.pl | 2 +- > misc/migration_tools/buildEDITORS.pl | 2 +- > misc/migration_tools/build_oai_sets.pl | 4 +-- > misc/migration_tools/bulkmarcimport.pl | 6 ++--- > misc/migration_tools/create_analytical_rel.pl | 4 +-- > misc/migration_tools/import_lexile.pl | 2 +- > misc/migration_tools/rebuild_zebra.pl | 4 +-- > .../switch_marc21_series_info.pl | 2 +- > misc/migration_tools/upgradeitems.pl | 4 +-- > misc/mod_zebraqueue.pl | 2 +- > misc/recreateIssueStatistics.pl | 2 +- > misc/sip_cli_emulator.pl | 4 +-- > misc/stage_file.pl | 2 +- > misc/translator/TmplTokenizer.pm | 2 +- > offline_circ/download.pl | 2 +- > offline_circ/enqueue_koc.pl | 8 +++--- > offline_circ/list.pl | 6 ++--- > offline_circ/process.pl | 4 +-- > offline_circ/process_koc.pl | 8 +++--- > offline_circ/service.pl | 4 +-- > opac/clubs/clubs-tab.pl | 4 +-- > opac/clubs/enroll.pl | 4 +-- > opac/errors/400.pl | 4 +-- > opac/errors/401.pl | 4 +-- > opac/errors/402.pl | 4 +-- > opac/errors/403.pl | 4 +-- > opac/errors/404.pl | 4 +-- > opac/errors/500.pl | 4 +-- > opac/ilsdi.pl | 4 +-- > opac/maintenance.pl | 2 +- > opac/opac-ISBDdetail.pl | 12 ++++----- > opac/opac-MARCdetail.pl | 10 +++---- > opac/opac-account-pay-return.pl | 2 +- > opac/opac-account-pay.pl | 2 +- > opac/opac-account.pl | 4 +-- > opac/opac-addbybiblionumber.pl | 4 +-- > opac/opac-alert-subscribe.pl | 6 ++--- > opac/opac-article-request-cancel.pl | 2 +- > opac/opac-authorities-home.pl | 8 +++--- > opac/opac-authoritiesdetail.pl | 10 +++---- > opac/opac-basket.pl | 10 +++---- > opac/opac-blocked.pl | 4 +-- > opac/opac-browse.pl | 4 +-- > opac/opac-browser.pl | 4 +-- > opac/opac-course-details.pl | 6 ++--- > opac/opac-course-reserves.pl | 6 ++--- > opac/opac-detail.pl | 26 +++++++++---------- > opac/opac-discharge.pl | 4 +-- > opac/opac-downloadcart.pl | 6 ++--- > opac/opac-downloadshelf.pl | 6 ++--- > opac/opac-export.pl | 2 +- > opac/opac-holdshistory.pl | 4 +-- > opac/opac-ics.pl | 2 +- > opac/opac-idref.pl | 4 +-- > opac/opac-illrequests.pl | 4 +-- > opac/opac-imageviewer.pl | 4 +-- > opac/opac-issue-note.pl | 6 ++--- > opac/opac-library.pl | 4 +-- > opac/opac-main.pl | 6 ++--- > opac/opac-memberentry.pl | 8 +++--- > opac/opac-messaging.pl | 4 +-- > opac/opac-modrequest-suspend.pl | 4 +-- > opac/opac-modrequest.pl | 4 +-- > opac/opac-mymessages.pl | 6 ++--- > opac/opac-news-rss.pl | 4 +-- > opac/opac-overdrive-search.pl | 4 +-- > opac/opac-passwd.pl | 4 +-- > opac/opac-password-recovery.pl | 4 +-- > opac/opac-patron-consent.pl | 4 +-- > opac/opac-patron-image.pl | 2 +- > opac/opac-privacy.pl | 4 +-- > opac/opac-ratings-ajax.pl | 4 +-- > opac/opac-ratings.pl | 2 +- > opac/opac-readingrecord.pl | 12 ++++----- > opac/opac-recordedbooks-search.pl | 4 +-- > opac/opac-registration-verify.pl | 6 ++--- > opac/opac-renew.pl | 4 +-- > opac/opac-reportproblem.pl | 6 ++--- > opac/opac-request-article.pl | 4 +-- > opac/opac-reserve.pl | 14 +++++----- > opac/opac-restrictedpage.pl | 4 +-- > opac/opac-retrieve-file.pl | 4 +-- > opac/opac-review.pl | 4 +-- > opac/opac-routing-lists.pl | 4 +-- > opac/opac-search-history.pl | 4 +-- > opac/opac-search.pl | 16 ++++++------ > opac/opac-sendbasket.pl | 8 +++--- > opac/opac-sendshelf.pl | 8 +++--- > opac/opac-serial-issues.pl | 6 ++--- > opac/opac-shareshelf.pl | 6 ++--- > opac/opac-shelves.pl | 12 ++++----- > opac/opac-showmarc.pl | 4 +-- > opac/opac-showreviews.pl | 8 +++--- > opac/opac-suggestions.pl | 8 +++--- > opac/opac-tags.pl | 10 +++---- > opac/opac-tags_subject.pl | 4 +-- > opac/opac-topissues.pl | 6 ++--- > opac/opac-user.pl | 12 ++++----- > opac/sci/sci-main.pl | 6 ++--- > opac/sco/help.pl | 4 +-- > opac/sco/printslip.pl | 6 ++--- > opac/sco/sco-main.pl | 6 ++--- > opac/sco/sco-patron-image.pl | 2 +- > opac/svc/shelfbrowser.pl | 6 ++--- > opac/tracklinks.pl | 6 ++--- > patron_lists/add-modify.pl | 4 +-- > patron_lists/delete.pl | 2 +- > patron_lists/list.pl | 4 +-- > patron_lists/lists.pl | 4 +-- > patron_lists/patrons.pl | 4 +-- > patroncards/add_user_search.pl | 4 +-- > patroncards/create-pdf.pl | 2 +- > patroncards/edit-batch.pl | 4 +-- > patroncards/edit-layout.pl | 4 +-- > patroncards/edit-profile.pl | 4 +-- > patroncards/edit-template.pl | 4 +-- > patroncards/home.pl | 4 +-- > patroncards/image-manage.pl | 4 +-- > patroncards/manage.pl | 4 +-- > patroncards/print.pl | 4 +-- > plugins/plugins-enable.pl | 2 +- > plugins/plugins-home.pl | 4 +-- > plugins/plugins-uninstall.pl | 2 +- > plugins/plugins-upload.pl | 4 +-- > plugins/run.pl | 4 +-- > pos/pay.pl | 4 +-- > pos/printreceipt.pl | 6 ++--- > pos/register.pl | 4 +-- > pos/registers.pl | 4 +-- > reports/acquisitions_stats.pl | 10 +++---- > reports/bor_issues_top.pl | 6 ++--- > reports/borrowers_out.pl | 6 ++--- > reports/borrowers_stats.pl | 8 +++--- > reports/cash_register_stats.pl | 6 ++--- > reports/cat_issues_top.pl | 8 +++--- > reports/catalogue_out.pl | 4 +-- > reports/catalogue_stats.pl | 10 +++---- > reports/dictionary.pl | 6 ++--- > reports/guided_reports.pl | 6 ++--- > reports/issues_avg_stats.pl | 6 ++--- > reports/issues_stats.pl | 8 +++--- > reports/itemslost.pl | 4 +-- > reports/manager.pl | 4 +-- > reports/orders_by_fund.pl | 4 +-- > reports/reports-home.pl | 4 +-- > reports/reserves_stats.pl | 8 +++--- > reports/serials_stats.pl | 8 +++--- > reserve/modrequest.pl | 4 +-- > reserve/modrequest_suspendall.pl | 4 +-- > reserve/placerequest.pl | 4 +-- > reserve/request.pl | 16 ++++++------ > reviews/reviewswaiting.pl | 4 +-- > rotating_collections/addItems.pl | 4 +-- > rotating_collections/editCollections.pl | 4 +-- > rotating_collections/rotatingCollections.pl | 4 +-- > rotating_collections/transferCollection.pl | 4 +-- > serials/acqui-search-result.pl | 4 +-- > serials/acqui-search.pl | 4 +-- > serials/add_user_search.pl | 4 +-- > serials/checkexpiration.pl | 6 ++--- > serials/claims.pl | 8 +++--- > serials/create-numberpattern.pl | 2 +- > serials/lateissues-export.pl | 2 +- > serials/routing-preview.pl | 10 +++---- > serials/routing.pl | 8 +++--- > serials/serials-collection.pl | 6 ++--- > serials/serials-edit.pl | 12 ++++----- > serials/serials-home.pl | 4 +-- > serials/serials-search.pl | 6 ++--- > serials/showpredictionpattern.pl | 8 +++--- > serials/subscription-add.pl | 16 ++++++------ > serials/subscription-batchedit.pl | 6 ++--- > serials/subscription-bib-search.pl | 10 +++---- > serials/subscription-detail.pl | 8 +++--- > serials/subscription-frequencies.pl | 8 +++--- > serials/subscription-frequency.pl | 2 +- > serials/subscription-history.pl | 6 ++--- > serials/subscription-numberpattern.pl | 2 +- > serials/subscription-numberpatterns.pl | 4 +-- > serials/subscription-renew.pl | 8 +++--- > serials/viewalerts.pl | 4 +-- > services/itemrecorddisplay.pl | 6 ++--- > suggestion/add_user_search.pl | 4 +-- > suggestion/suggestion.pl | 8 +++--- > svc/cataloguing/automatic_linker.pl | 4 +-- > t/lib/TestBuilder.pm | 4 +-- > tags/list.pl | 10 +++---- > tags/review.pl | 6 ++--- > tools/access_files.pl | 4 +-- > tools/ajax-inventory.pl | 2 +- > tools/automatic_item_modification_by_age.pl | 6 ++--- > tools/background-job-progress.pl | 2 +- > tools/batchMod.pl | 12 ++++----- > tools/batch_delete_records.pl | 8 +++--- > tools/batch_record_modification.pl | 2 +- > tools/batch_records_ajax.pl | 4 +-- > tools/cleanborrowers.pl | 6 ++--- > tools/copy-holidays.pl | 2 +- > tools/csv-profiles.pl | 4 +-- > tools/exceptionHolidays.pl | 2 +- > tools/export.pl | 4 +-- > tools/holidays.pl | 4 +-- > tools/import_borrowers.pl | 4 +-- > tools/inventory.pl | 14 +++++----- > tools/koha-news.pl | 6 ++--- > tools/letter.pl | 6 ++--- > tools/manage-marc-import.pl | 8 +++--- > tools/marc_modification_templates.pl | 4 +-- > tools/modborrowers.pl | 6 ++--- > tools/newHolidays.pl | 2 +- > tools/overduerules.pl | 8 +++--- > tools/picture-upload.pl | 4 +-- > tools/problem-reports.pl | 4 +-- > tools/quotes-upload.pl | 4 +-- > tools/quotes.pl | 4 +-- > tools/scheduler.pl | 8 +++--- > tools/showdiffmarc.pl | 10 +++---- > tools/stage-marc-import.pl | 6 ++--- > tools/stockrotation.pl | 6 ++--- > tools/tools-home.pl | 6 ++--- > tools/upload-cover-image.pl | 4 +-- > tools/upload-file.pl | 2 +- > tools/upload.pl | 4 +-- > tools/viewlog.pl | 10 +++---- > virtualshelves/addbybiblionumber.pl | 4 +-- > virtualshelves/downloadshelf.pl | 6 ++--- > virtualshelves/sendshelf.pl | 8 +++--- > virtualshelves/shelves.pl | 10 +++---- > 651 files changed, 1568 insertions(+), 1568 deletions(-) > >diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm >index ada432ac1fa..f22ee48c729 100644 >--- a/C4/Acquisition.pm >+++ b/C4/Acquisition.pm >@@ -24,7 +24,7 @@ use Text::CSV_XS; > use C4::Context; > use C4::Debug; > use C4::Suggestions; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcFromKohaField GetMarcStructure IsMarcStructureInternal ); > use C4::Contract; > use C4::Debug; > use C4::Log qw(logaction); >@@ -41,7 +41,7 @@ use Koha::Libraries; > use Koha::CsvProfiles; > use Koha::Patrons; > >-use C4::Koha; >+use C4::Koha qw( GetVariationsOfISBN ); > > use MARC::Field; > use MARC::Record; >diff --git a/C4/Auth.pm b/C4/Auth.pm >index b54bf1ef39b..ffca3a4891b 100644 >--- a/C4/Auth.pm >+++ b/C4/Auth.pm >@@ -28,11 +28,11 @@ use CGI::Session; > > use C4::Context; > use C4::Templates; # to get the template >-use C4::Languages; >+use C4::Languages qw( getlanguage ); > use C4::Search::History; > use Koha; > 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::Library::Groups; >@@ -44,7 +44,7 @@ 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 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/; > >diff --git a/C4/Auth_with_cas.pm b/C4/Auth_with_cas.pm >index 6eed3967c74..84798be020a 100644 >--- a/C4/Auth_with_cas.pm >+++ b/C4/Auth_with_cas.pm >@@ -22,7 +22,7 @@ use warnings; > > use C4::Debug; > 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; >diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm >index e5f63bcd33a..93fa0b8d435 100644 >--- a/C4/Auth_with_ldap.pm >+++ b/C4/Auth_with_ldap.pm >@@ -23,9 +23,9 @@ use Carp; > use C4::Debug; > use C4::Context; > use C4::Members::Messaging; >-use C4::Auth qw(checkpw_internal); >+use C4::Auth qw( checkpw checkpw_internal ); > use Koha::Patrons; >-use Koha::AuthUtils qw(hash_password); >+use Koha::AuthUtils qw( hash_password ); > use List::MoreUtils qw( any ); > use Net::LDAP; > use Net::LDAP::Filter; >diff --git a/C4/Auth_with_shibboleth.pm b/C4/Auth_with_shibboleth.pm >index e037a04b766..4d6d2d94a3a 100644 >--- a/C4/Auth_with_shibboleth.pm >+++ b/C4/Auth_with_shibboleth.pm >@@ -21,7 +21,7 @@ use Modern::Perl; > > use C4::Debug; > 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; >diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm >index 1bb808bb9c4..d2bdfccbf7b 100644 >--- a/C4/AuthoritiesMarc.pm >+++ b/C4/AuthoritiesMarc.pm >@@ -22,11 +22,11 @@ use strict; > use warnings; > use C4::Context; > use MARC::Record; >-use C4::Biblio; >-use C4::Search; >+use C4::Biblio qw( GetMarcBiblio ModBiblio GetFrameworkCode ); >+use C4::Search qw( FindDuplicate new_record_from_zebra ); > use C4::AuthoritiesMarc::MARC21; > use C4::AuthoritiesMarc::UNIMARC; >-use C4::Charset; >+use C4::Charset qw( SetUTF8Flag ); > use C4::Log; > use Koha::MetadataRecord::Authority; > use Koha::Authorities; >diff --git a/C4/BackgroundJob.pm b/C4/BackgroundJob.pm >index 48683f97659..733f72e11b1 100644 >--- a/C4/BackgroundJob.pm >+++ b/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; > > >diff --git a/C4/Biblio.pm b/C4/Biblio.pm >index 6382b30c4d7..425fbd4820e 100644 >--- a/C4/Biblio.pm >+++ b/C4/Biblio.pm >@@ -89,11 +89,11 @@ use C4::Koha; > use C4::Log; # logaction > use C4::Budgets; > use C4::ClassSource qw( GetClassSort ); >-use C4::Charset qw( SetUTF8Flag ); >+use C4::Charset qw( SetUTF8Flag SetMarcUnicodeFlag StripNonXmlChars nsb_clean ); > use C4::Linker; > use C4::OAI::Sets; > use C4::Debug; >-use C4::Items; >+use C4::Items qw( sub GetHiddenItemnumbers GetMarcItem ); > > use Koha::Caches; > use Koha::Authority::Types; >diff --git a/C4/Breeding.pm b/C4/Breeding.pm >index 0fe39bf99c0..0c3c2b5c676 100644 >--- a/C4/Breeding.pm >+++ b/C4/Breeding.pm >@@ -21,14 +21,14 @@ package C4::Breeding; > use strict; > use warnings; > >-use C4::Biblio; >-use C4::Koha; >-use C4::Charset; >+use C4::Biblio qw( AddBiblio TransformMarcToKoha TransformMarcToKohaOneField ); >+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( sub GetZ3950BatchId AddBiblioToBatch AddAuthToBatch ); > use C4::AuthoritiesMarc; #GuessAuthTypeCode, FindDuplicateAuthority >-use C4::Languages; >+use C4::Languages qw( getlanguage ); > use Koha::Database; > use Koha::XSLT::Base; > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index 9f0e82e5de1..e116c520fc9 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -27,16 +27,16 @@ use Encode; > use Koha::DateUtils; > use C4::Context; > use C4::Stats; >-use C4::Reserves; >-use C4::Biblio; >-use C4::Items; >+use C4::Reserves qw( CheckReserves CanItemBeReserved MoveReserve ModReserve ModReserveMinusPriority RevertWaitingStatus IsItemOnHoldAndFound IsAvailableForItemLevelRequest ); >+use C4::Biblio qw( UpdateTotalIssues ModZebra ); >+use C4::Items qw( sub ModItemTransfer ModDateLastSeen CartToShelf ); > use C4::Members; > use C4::Accounts; > use C4::ItemCirculationAlertPreference; > use C4::Message; > use C4::Debug; > use C4::Log; # logaction >-use C4::Overdues qw(CalcFine UpdateFine get_chargeable_units); >+use C4::Overdues qw( UpdateFine get_chargeable_units CalcFine ); > use C4::RotatingCollections qw(GetCollectionItemBranches); > use Algorithm::CheckDigits; > >diff --git a/C4/ClassSortRoutine/Dewey.pm b/C4/ClassSortRoutine/Dewey.pm >index 111bafb5373..eedf4ed768b 100644 >--- a/C4/ClassSortRoutine/Dewey.pm >+++ b/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); > >diff --git a/C4/ClassSortRoutine/Generic.pm b/C4/ClassSortRoutine/Generic.pm >index 8b7d890394f..665dd53ca63 100644 >--- a/C4/ClassSortRoutine/Generic.pm >+++ b/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); > >diff --git a/C4/ClassSortRoutine/LCC.pm b/C4/ClassSortRoutine/LCC.pm >index 5f9c8f9c6f8..b943fb683e2 100644 >--- a/C4/ClassSortRoutine/LCC.pm >+++ b/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); > >diff --git a/C4/CourseReserves.pm b/C4/CourseReserves.pm >index 5e8c667a0d9..73bc6e254cb 100644 >--- a/C4/CourseReserves.pm >+++ b/C4/CourseReserves.pm >@@ -20,7 +20,7 @@ use Modern::Perl; > 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; >diff --git a/C4/HoldsQueue.pm b/C4/HoldsQueue.pm >index 03331a39145..e766372b58e 100644 >--- a/C4/HoldsQueue.pm >+++ b/C4/HoldsQueue.pm >@@ -24,8 +24,8 @@ use warnings; > > use C4::Context; > use C4::Search; >-use C4::Items; >-use C4::Circulation; >+use C4::Items qw( sub ); >+use C4::Circulation qw( GetTransfers GetBranchItemRule ); > use C4::Members; > use C4::Biblio; > use Koha::DateUtils; >diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm >index a28c382d683..2c33f22dcca 100644 >--- a/C4/ILSDI/Services.pm >+++ b/C4/ILSDI/Services.pm >@@ -21,18 +21,18 @@ use strict; > use warnings; > > use C4::Members; >-use C4::Items; >-use C4::Circulation; >+use C4::Items qw( sub 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 C4::Auth qw( checkpw ); > use XML::Simple; > use HTML::Entities; > use CGI qw ( -utf8 ); > use DateTime; >-use C4::Auth; >+use C4::Auth qw( checkpw ); > use Koha::DateUtils; > > use Koha::Biblios; >diff --git a/C4/ImportBatch.pm b/C4/ImportBatch.pm >index 4e9ff64de8e..9bd20fd7945 100644 >--- a/C4/ImportBatch.pm >+++ b/C4/ImportBatch.pm >@@ -21,10 +21,10 @@ 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 ModBiblio GetMarcFromKohaField GetXmlBiblio TransformMarcToKoha DelBiblio ); >+use C4::Items qw( sub ModItemFromMarc AddItemFromMarc ); >+use C4::Charset qw( SetUTF8Flag StripNonXmlChars MarcToUTF8Record ); > use C4::AuthoritiesMarc; > use C4::MarcModificationTemplates; > use Koha::Items; >diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm >index fe1eab57cda..06ef6c716fa 100644 >--- a/C4/InstallAuth.pm >+++ b/C4/InstallAuth.pm >@@ -25,7 +25,7 @@ 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; > >diff --git a/C4/Items.pm b/C4/Items.pm >index f537f6c6925..001c2d9ffd4 100644 >--- a/C4/Items.pm >+++ b/C4/Items.pm >@@ -51,10 +51,10 @@ use Carp; > use Try::Tiny; > use C4::Context; > use C4::Koha; >-use C4::Biblio qw( GetFrameworkCode ); >+use C4::Biblio qw( GetFrameworkCode GetMarcFromKohaField TransformMarcToKoha _disambiguate AddBiblio GetMarcBiblio TransformKohaToMarc GetMarcStructure ); > use Koha::DateUtils; > use MARC::Record; >-use C4::ClassSource; >+use C4::ClassSource qw( GetClassSort GetClassSources GetClassSource ); > use C4::Log; > use List::MoreUtils qw(any); > use DateTime::Format::MySQL; >diff --git a/C4/Labels/Label.pm b/C4/Labels/Label.pm >index 3b71c946e81..c7ed8436204 100644 >--- a/C4/Labels/Label.pm >+++ b/C4/Labels/Label.pm >@@ -11,7 +11,7 @@ use Text::Bidi qw( log2vis ); > > use C4::Context; > use C4::Debug; >-use C4::Biblio; >+use C4::Biblio qw( GetAuthorisedValueDesc GetMarcFromKohaField GetMarcBiblio ); > use Koha::ClassSources; > use Koha::ClassSortRules; > use Koha::ClassSplitRules; >diff --git a/C4/MarcModificationTemplates.pm b/C4/MarcModificationTemplates.pm >index 50d26a04ae6..5d6a2251680 100644 >--- a/C4/MarcModificationTemplates.pm >+++ b/C4/MarcModificationTemplates.pm >@@ -22,7 +22,7 @@ use Modern::Perl; > use DateTime; > > use C4::Context; >-use Koha::SimpleMARC; >+use Koha::SimpleMARC qw( field_exists field_equals copy_field copy_and_replace_field add_field update_field move_field delete_field ); > use Koha::MoreUtils; > use Koha::DateUtils; > >diff --git a/C4/Members.pm b/C4/Members.pm >index c2338259e55..7ab39317993 100644 >--- a/C4/Members.pm >+++ b/C4/Members.pm >@@ -28,11 +28,11 @@ 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 C4::Overdues qw( checkoverdues ); > use C4::Reserves; > use C4::Accounts; > use C4::Biblio; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter ); > use C4::NewsChannels; #get slip news > use DateTime; > use Koha::Database; >diff --git a/C4/Message.pm b/C4/Message.pm >index e10e3c594b4..c4f216f557a 100644 >--- a/C4/Message.pm >+++ b/C4/Message.pm >@@ -22,7 +22,7 @@ package C4::Message; > use strict; > use warnings; > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter getletter ); > use YAML::XS; > use Encode; > use Carp; >diff --git a/C4/Output.pm b/C4/Output.pm >index db6c755f7f6..1c7f2089d28 100644 >--- a/C4/Output.pm >+++ b/C4/Output.pm >@@ -30,7 +30,7 @@ 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; > >diff --git a/C4/Record.pm b/C4/Record.pm >index 0c3c670ef30..695d891aa5e 100644 >--- a/C4/Record.pm >+++ b/C4/Record.pm >@@ -26,7 +26,7 @@ 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 C4::Biblio qw( GetXmlBiblio GetMarcBiblio EmbedItemsInMarcBiblio GetFrameworkCode ); > use C4::Koha; #marc2csv > use C4::XSLT (); > use YAML::XS; #marcrecords2csv >@@ -34,7 +34,7 @@ use Encode; > use Template; > use Text::CSV::Encoded; #marc2csv > use Koha::Items; >-use Koha::SimpleMARC qw(read_field); >+use Koha::SimpleMARC qw( delete_field read_field ); > use Koha::XSLT::Base; > use Koha::CsvProfiles; > use Koha::AuthorisedValues; >diff --git a/C4/Reports/Guided.pm b/C4/Reports/Guided.pm >index cc9fafd0613..8955fb2b492 100644 >--- a/C4/Reports/Guided.pm >+++ b/C4/Reports/Guided.pm >@@ -24,7 +24,7 @@ use JSON qw( from_json ); > > use C4::Context; > use C4::Templates qw/themelanguage/; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use Koha::DateUtils; > use Koha::Patrons; > use Koha::Reports; >diff --git a/C4/Reserves.pm b/C4/Reserves.pm >index 1020057f2e8..fc24a0e45f9 100644 >--- a/C4/Reserves.pm >+++ b/C4/Reserves.pm >@@ -25,10 +25,10 @@ use Modern::Perl; > > use C4::Accounts; > use C4::Biblio; >-use C4::Circulation; >+use C4::Circulation qw( CheckIfIssuedToPatron checkHighHolds GetAgeRestriction GetBranchItemRule ); > use C4::Context; >-use C4::Items; >-use C4::Letters; >+use C4::Items qw( sub get_hostitemnumbers_of ModItemTransfer CartToShelf ); >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Log; > use C4::Members::Messaging; > use C4::Members; >diff --git a/C4/Ris.pm b/C4/Ris.pm >index 867030c73c0..fbec4c770d9 100644 >--- a/C4/Ris.pm >+++ b/C4/Ris.pm >@@ -67,7 +67,7 @@ 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); >diff --git a/C4/SIP/ILS.pm b/C4/SIP/ILS.pm >index 3e5b6a48240..f6f9a7ce990 100644 >--- a/C4/SIP/ILS.pm >+++ b/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; >diff --git a/C4/SIP/SIPServer.pm b/C4/SIP/SIPServer.pm >index f1c1ae448b3..41080d554e9 100644 >--- a/C4/SIP/SIPServer.pm >+++ b/C4/SIP/SIPServer.pm >@@ -13,12 +13,12 @@ use Scalar::Util qw(blessed); > require UNIVERSAL::require; > > use C4::Context; >-use C4::SIP::Sip qw(siplog); >-use C4::SIP::Sip::Constants qw(:all); >-use C4::SIP::Sip::Configuration; >-use C4::SIP::Sip::Checksum qw(checksum verify_cksum); >-use C4::SIP::Sip::MsgType qw( handle login_core ); >-use C4::SIP::Logger qw(set_logger); >+use C4::SIP::Sip qw( siplog ); >+use C4::SIP::Sip qw( siplog ); >+use C4::SIP::Sip qw( siplog ); >+use C4::SIP::Sip qw( siplog ); >+use C4::SIP::Sip qw( siplog ); >+use C4::SIP::Logger qw( set_logger ); > > use Koha::Caches; > >diff --git a/C4/SIP/Sip.pm b/C4/SIP/Sip.pm >index 3d68f9765c7..2842a611b6f 100644 >--- a/C4/SIP/Sip.pm >+++ b/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); > >diff --git a/C4/Search.pm b/C4/Search.pm >index f94412d5d3e..5589cfd30df 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -17,16 +17,16 @@ package C4::Search; > > use Modern::Perl; > 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::Reserves qw( GetReserveStatus ); > use C4::Debug; >-use C4::Charset; >+use C4::Charset qw( SetUTF8Flag ); > use Koha::AuthorisedValues; > use Koha::ItemTypes; > use Koha::Libraries; >diff --git a/C4/Serials.pm b/C4/Serials.pm >index 46bd8d12453..d0219693d27 100644 >--- a/C4/Serials.pm >+++ b/C4/Serials.pm >@@ -20,12 +20,12 @@ 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::Biblio qw( GetMarcBiblio GetMarcFromKohaField ModBiblio ); > use C4::Log; # logaction > use C4::Debug; > use C4::Serials::Frequency; >diff --git a/C4/Service.pm b/C4/Service.pm >index bdb2ba17ff1..4cb1fd13fe5 100644 >--- a/C4/Service.pm >+++ b/C4/Service.pm >@@ -43,8 +43,8 @@ use warnings; > > use CGI qw ( -utf8 ); > use C4::Auth qw( check_api_auth ); >-use C4::Output qw( :ajax ); >-use C4::Output::JSONStream; >+use C4::Output qw( output_with_http_headers ); >+use C4::Output qw( output_with_http_headers ); > use JSON; > > our $debug; >diff --git a/C4/ShelfBrowser.pm b/C4/ShelfBrowser.pm >index 1eba444d96b..85a9f055214 100644 >--- a/C4/ShelfBrowser.pm >+++ b/C4/ShelfBrowser.pm >@@ -20,9 +20,9 @@ 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; > >diff --git a/C4/SocialData.pm b/C4/SocialData.pm >index 218cf4e9f7e..8217ccb49ea 100644 >--- a/C4/SocialData.pm >+++ b/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 > >diff --git a/C4/Suggestions.pm b/C4/Suggestions.pm >index e1df70cece9..2e7676c9225 100644 >--- a/C4/Suggestions.pm >+++ b/C4/Suggestions.pm >@@ -24,7 +24,7 @@ use CGI qw ( -utf8 ); > use C4::Context; > use C4::Output; > use C4::Debug; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Biblio qw( GetMarcFromKohaField ); > use Koha::DateUtils; > use Koha::Suggestions; >diff --git a/C4/Templates.pm b/C4/Templates.pm >index 2aeedf662e0..d23b3afb8fa 100644 >--- a/C4/Templates.pm >+++ b/C4/Templates.pm >@@ -32,7 +32,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( regex_lang_subtags get_bidi getTranslatedLanguages getlanguage ); > > use C4::Context; > >diff --git a/C4/TmplToken.pm b/C4/TmplToken.pm >index 045269b80b7..77932cc1c07 100644 >--- a/C4/TmplToken.pm >+++ b/C4/TmplToken.pm >@@ -20,7 +20,7 @@ package C4::TmplToken; > > use strict; > use warnings; >-use C4::TmplTokenType; >+use C4::TmplTokenType qw( DIRECTIVE TAG CDATA TEXT TEXT_PARAMETRIZED ); > > =head1 NAME > >diff --git a/C4/XISBN.pm b/C4/XISBN.pm >index 214accdfbb1..d9c3dd9e664 100644 >--- a/C4/XISBN.pm >+++ b/C4/XISBN.pm >@@ -20,9 +20,9 @@ package C4::XISBN; > use Modern::Perl; > use XML::Simple; > #use LWP::Simple; >-use C4::Biblio; >-use C4::Koha; >-use C4::Search; >+use C4::Biblio qw( TransformMarcToKoha TransformMarcToKohaOneField ); >+use C4::Koha qw( GetNormalizedISBN ); >+use C4::Search qw( new_record_from_zebra ); > use C4::External::Syndetics qw(get_syndetics_editions); > use LWP::UserAgent; > use HTTP::Request::Common; >diff --git a/C4/XSLT.pm b/C4/XSLT.pm >index 3cdf451b285..b290948c7b3 100644 >--- a/C4/XSLT.pm >+++ b/C4/XSLT.pm >@@ -24,9 +24,9 @@ package C4::XSLT; > use Modern::Perl; > > use C4::Context; >-use C4::Items; >-use C4::Koha; >-use C4::Biblio; >+use C4::Items qw( sub ); >+use C4::Koha qw( xml_escape ); >+use C4::Biblio qw( GetFrameworkCode GetMarcStructure GetAuthorisedValueDesc ); > use C4::Circulation; > use C4::Reserves; > use Koha::AuthorisedValues; >diff --git a/Koha/Account.pm b/Koha/Account.pm >index bd4af13a2d7..3bcd630c116 100644 >--- a/Koha/Account.pm >+++ b/Koha/Account.pm >@@ -25,7 +25,7 @@ use List::MoreUtils qw( uniq ); > use Try::Tiny; > > use C4::Circulation qw( ReturnLostItem CanBookBeRenewed AddRenewal ); >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Log qw( logaction ); > use C4::Stats qw( UpdateStats ); > use C4::Overdues qw(GetFine); >diff --git a/Koha/Account/Line.pm b/Koha/Account/Line.pm >index 9418267625e..2765d63dfc7 100644 >--- a/Koha/Account/Line.pm >+++ b/Koha/Account/Line.pm >@@ -21,7 +21,7 @@ use Carp; > use Data::Dumper; > > use C4::Log qw(logaction); >-use C4::Overdues qw(GetFine); >+use C4::Overdues qw( UpdateFine ); > > use Koha::Account::CreditType; > use Koha::Account::DebitType; >diff --git a/Koha/Acquisition/Order.pm b/Koha/Acquisition/Order.pm >index 07dea689390..66558a05a4d 100644 >--- a/Koha/Acquisition/Order.pm >+++ b/Koha/Acquisition/Order.pm >@@ -20,7 +20,7 @@ use Modern::Perl; > use Carp qw( croak ); > use Try::Tiny; > >-use C4::Biblio qw(DelBiblio); >+use C4::Biblio qw( DelBiblio ); > > use Koha::Acquisition::Baskets; > use Koha::Acquisition::Funds; >diff --git a/Koha/BackgroundJob/BatchUpdateBiblio.pm b/Koha/BackgroundJob/BatchUpdateBiblio.pm >index 7cb7969474d..e2dd32b077c 100644 >--- a/Koha/BackgroundJob/BatchUpdateBiblio.pm >+++ b/Koha/BackgroundJob/BatchUpdateBiblio.pm >@@ -20,7 +20,7 @@ use JSON qw( encode_json decode_json ); > > use Koha::BackgroundJobs; > use Koha::DateUtils qw( dt_from_string ); >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode ModBiblio ); > use C4::MarcModificationTemplates; > > use base 'Koha::BackgroundJob'; >diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm >index 02d2aba04dd..81146545526 100644 >--- a/Koha/Biblio.pm >+++ b/Koha/Biblio.pm >@@ -24,7 +24,7 @@ use List::MoreUtils qw(any); > use URI; > use URI::Escape; > >-use C4::Koha; >+use C4::Koha qw( GetNormalizedISBN ); > use C4::Biblio qw(); > > use Koha::Database; >diff --git a/Koha/BiblioUtils.pm b/Koha/BiblioUtils.pm >index 9be2e6168ac..ace8c9b07b0 100644 >--- a/Koha/BiblioUtils.pm >+++ b/Koha/BiblioUtils.pm >@@ -32,7 +32,7 @@ the new thing that should be used. > > =cut > >-use C4::Biblio; # EmbedItemsInMarcBiblio >+use C4::Biblio qw( GetMarcBiblio ); > use Koha::MetadataIterator; > use Koha::Database; > use Modern::Perl; >diff --git a/Koha/BiblioUtils/Iterator.pm b/Koha/BiblioUtils/Iterator.pm >index f8a4e41019d..445bf3fec03 100644 >--- a/Koha/BiblioUtils/Iterator.pm >+++ b/Koha/BiblioUtils/Iterator.pm >@@ -43,7 +43,7 @@ Returns biblionumber and marc in list context. > > =cut > >-use C4::Biblio; # :( - for EmbedItemsInMarcBiblio >+use C4::Biblio qw( GetXmlBiblio EmbedItemsInMarcBiblio ); > > use Carp; > use MARC::Record; >diff --git a/Koha/Checkout.pm b/Koha/Checkout.pm >index 3693beeb90e..5c27a412d99 100644 >--- a/Koha/Checkout.pm >+++ b/Koha/Checkout.pm >@@ -24,7 +24,7 @@ use Carp; > use DateTime; > use Try::Tiny; > >-use C4::Circulation qw(MarkIssueReturned); >+use C4::Circulation qw( LostItem MarkIssueReturned ); > use Koha::Checkouts::ReturnClaims; > use Koha::Database; > use Koha::DateUtils; >diff --git a/Koha/Checkouts.pm b/Koha/Checkouts.pm >index 0f2da95c651..902e3165801 100644 >--- a/Koha/Checkouts.pm >+++ b/Koha/Checkouts.pm >@@ -22,7 +22,7 @@ use Modern::Perl; > use Carp; > > use C4::Context; >-use C4::Circulation; >+use C4::Circulation qw( AddReturn ); > use Koha::Checkout; > use Koha::Database; > use Koha::DateUtils; >diff --git a/Koha/EDI.pm b/Koha/EDI.pm >index 5ea22bc15a4..dff62b15a2b 100644 >--- a/Koha/EDI.pm >+++ b/Koha/EDI.pm >@@ -30,7 +30,7 @@ use Koha::Database; > use Koha::DateUtils; > use C4::Acquisition qw( NewBasket ModOrder); > use C4::Suggestions qw( ModSuggestion ); >-use C4::Biblio qw( AddBiblio TransformKohaToMarc GetMarcBiblio GetFrameworkCode GetMarcFromKohaField ); >+use C4::Biblio qw( GetFrameworkCode GetMarcFromKohaField AddBiblio TransformKohaToMarc ); > use Koha::Edifact::Order; > use Koha::Edifact; > use C4::Log qw(logaction); >diff --git a/Koha/Exporter/Record.pm b/Koha/Exporter/Record.pm >index eaebe576393..ab7ad296de1 100644 >--- a/Koha/Exporter/Record.pm >+++ b/Koha/Exporter/Record.pm >@@ -5,7 +5,7 @@ use MARC::File::XML; > use MARC::File::USMARC; > > use C4::AuthoritiesMarc; >-use C4::Biblio; >+use C4::Biblio qw( RemoveAllNsb GetMarcBiblio EmbedItemsInMarcBiblio GetMarcFromKohaField ); > use C4::Record; > use Koha::CsvProfiles; > use Koha::Logger; >diff --git a/Koha/ExternalContent.pm b/Koha/ExternalContent.pm >index 578e035cf5d..148cd380a2e 100644 >--- a/Koha/ExternalContent.pm >+++ b/Koha/ExternalContent.pm >@@ -24,7 +24,7 @@ use base qw(Class::Accessor); > use Koha; > use Koha::Logger; > use Koha::Patrons; >-use C4::Auth; >+use C4::Auth qw( get_session ); > > __PACKAGE__->mk_accessors(qw(client koha_session_id koha_patron logger)); > >diff --git a/Koha/Hold.pm b/Koha/Hold.pm >index 2bdae269ec2..fcd49f99b97 100644 >--- a/Koha/Hold.pm >+++ b/Koha/Hold.pm >@@ -25,7 +25,7 @@ use Data::Dumper qw(Dumper); > use List::MoreUtils qw(any); > > use C4::Context qw(preference); >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Log; > > use Koha::AuthorisedValues; >diff --git a/Koha/I18N.pm b/Koha/I18N.pm >index ca0ceae0c9c..bc6c6e4ce78 100644 >--- a/Koha/I18N.pm >+++ b/Koha/I18N.pm >@@ -20,7 +20,7 @@ package Koha::I18N; > use Modern::Perl; > > use CGI; >-use C4::Languages; >+use C4::Languages qw( getlanguage ); > use C4::Context; > > use Encode; >diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm >index 74d9b84d10f..1ddb494a074 100644 >--- a/Koha/Illrequest.pm >+++ b/Koha/Illrequest.pm >@@ -25,7 +25,7 @@ use Encode qw( encode ); > use Try::Tiny; > use DateTime; > >-use C4::Letters; >+use C4::Letters qw( EnqueueLetter GetPreparedLetter ); > use C4::Members; > use Koha::Database; > use Koha::DateUtils qw/ dt_from_string /; >@@ -41,7 +41,7 @@ use Koha::Items; > use Koha::ItemTypes; > use Koha::Libraries; > >-use C4::Circulation qw( CanBookBeIssued AddIssue ); >+use C4::Circulation qw( CanBookBeIssued AddIssue ); > > use base qw(Koha::Object); > >diff --git a/Koha/Illrequest/Logger.pm b/Koha/Illrequest/Logger.pm >index 971b3a8b761..7bc5ef3360f 100644 >--- a/Koha/Illrequest/Logger.pm >+++ b/Koha/Illrequest/Logger.pm >@@ -21,7 +21,7 @@ use Modern::Perl; > use JSON qw( to_json from_json ); > use Time::Local; > >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Context; > use C4::Templates; > use C4::Log qw( logaction ); >diff --git a/Koha/Item.pm b/Koha/Item.pm >index 2bad0202875..e7484c236fc 100644 >--- a/Koha/Item.pm >+++ b/Koha/Item.pm >@@ -28,9 +28,9 @@ use Koha::Database; > use Koha::DateUtils qw( dt_from_string ); > > use C4::Context; >-use C4::Circulation; >-use C4::Reserves; >-use C4::ClassSource; # FIXME We would like to avoid that >+use C4::Circulation qw( GetBranchItemRule ); >+use C4::Reserves qw( GetReservesControlBranch ); >+use C4::ClassSource qw( GetClassSort ); > use C4::Log qw( logaction ); > > use Koha::Checkouts; >diff --git a/Koha/Item/Transfer.pm b/Koha/Item/Transfer.pm >index 4112b3fab90..469ee40fdfb 100644 >--- a/Koha/Item/Transfer.pm >+++ b/Koha/Item/Transfer.pm >@@ -20,7 +20,7 @@ use Modern::Perl; > use Carp; > use Try::Tiny; > >-use C4::Items; >+use C4::Items qw( sub CartToShelf ModDateLastSeen ); > > use Koha::Database; > use Koha::DateUtils; >diff --git a/Koha/ItemType.pm b/Koha/ItemType.pm >index 939c97704e0..6d7c0013529 100644 >--- a/Koha/ItemType.pm >+++ b/Koha/ItemType.pm >@@ -19,8 +19,8 @@ use Modern::Perl; > > use Carp; > >-use C4::Koha; >-use C4::Languages; >+use C4::Koha qw( getitemtypeimagelocation ); >+use C4::Languages qw( getlanguage ); > use Koha::Database; > use Koha::CirculationRules; > use Koha::Localizations; >diff --git a/Koha/ItemTypes.pm b/Koha/ItemTypes.pm >index 746bbb23ea8..49ffb5f4017 100644 >--- a/Koha/ItemTypes.pm >+++ b/Koha/ItemTypes.pm >@@ -19,7 +19,7 @@ use Modern::Perl; > > use Carp; > >-use C4::Languages; >+use C4::Languages qw( getlanguage ); > > use Koha::Database; > use Koha::ItemType; >diff --git a/Koha/MetaSearcher.pm b/Koha/MetaSearcher.pm >index 47dffe801ef..80a74c3bf9d 100644 >--- a/Koha/MetaSearcher.pm >+++ b/Koha/MetaSearcher.pm >@@ -22,7 +22,7 @@ use Modern::Perl; > use base 'Class::Accessor'; > > use C4::Charset qw( MarcToUTF8Record SetUTF8Flag ); >-use C4::Search qw(); # Purely for new_record_from_zebra >+use C4::Search qw( new_record_from_zebra ); > use DBIx::Class::ResultClass::HashRefInflator; > use IO::Select; > use Koha::Caches; >diff --git a/Koha/MetadataRecord.pm b/Koha/MetadataRecord.pm >index ce792f7ead2..a8eb5875f17 100644 >--- a/Koha/MetadataRecord.pm >+++ b/Koha/MetadataRecord.pm >@@ -35,7 +35,7 @@ and authority) records in Koha. > use Modern::Perl; > > use Carp; >-use C4::Biblio; >+use C4::Biblio qw( TransformMarcToKoha TransformMarcToKohaOneField ); > use Koha::Util::MARC; > > use base qw(Class::Accessor); >diff --git a/Koha/MetadataRecord/Authority.pm b/Koha/MetadataRecord/Authority.pm >index 31e5b530394..655cc2edf8d 100644 >--- a/Koha/MetadataRecord/Authority.pm >+++ b/Koha/MetadataRecord/Authority.pm >@@ -37,7 +37,7 @@ use Carp; > use C4::Context; > use MARC::Record; > use MARC::File::XML; >-use C4::Charset; >+use C4::Charset qw( StripNonXmlChars ); > use Koha::Util::MARC; > > use base qw(Koha::MetadataRecord); >diff --git a/Koha/Patron.pm b/Koha/Patron.pm >index 19a9215c86c..b27668e614e 100644 >--- a/Koha/Patron.pm >+++ b/Koha/Patron.pm >@@ -30,7 +30,7 @@ use C4::Log; > use Koha::Account; > use Koha::ArticleRequests; > use C4::Letters qw( GetPreparedLetter EnqueueLetter ); >-use Koha::AuthUtils; >+use Koha::AuthUtils qw( hash_password is_password_valid ); > use Koha::Checkouts; > use Koha::Club::Enrollments; > use Koha::Database; >diff --git a/Koha/Patron/Discharge.pm b/Koha/Patron/Discharge.pm >index f35f434109c..96e674327f8 100644 >--- a/Koha/Patron/Discharge.pm >+++ b/Koha/Patron/Discharge.pm >@@ -6,7 +6,7 @@ use File::Temp qw( :POSIX ); > use Carp; > > use C4::Templates qw ( gettemplate ); >-use C4::Letters qw ( GetPreparedLetter ); >+use C4::Letters qw( GetPreparedLetter ); > > use Koha::Database; > use Koha::DateUtils qw( dt_from_string output_pref ); >diff --git a/Koha/Patrons/Import.pm b/Koha/Patrons/Import.pm >index e6c59eab487..35ccfb4cc82 100644 >--- a/Koha/Patrons/Import.pm >+++ b/Koha/Patrons/Import.pm >@@ -24,7 +24,7 @@ use Text::CSV; > use Encode qw( decode_utf8 ); > use Try::Tiny; > >-use C4::Members; >+use C4::Members qw( checkcardnumber ); > > use Koha::Libraries; > use Koha::Patrons; >diff --git a/Koha/Plugins/Base.pm b/Koha/Plugins/Base.pm >index a5cb15e3c16..cfdf42fb9fc 100644 >--- a/Koha/Plugins/Base.pm >+++ b/Koha/Plugins/Base.pm >@@ -26,7 +26,7 @@ use List::Util qw(max); > use base qw{Module::Bundled::Files}; > > use C4::Context; >-use C4::Output qw(output_with_http_headers output_html_with_http_headers); >+use C4::Output qw( output_with_http_headers ); > > =head1 NAME > >diff --git a/Koha/SearchEngine/Search.pm b/Koha/SearchEngine/Search.pm >index 0b7222741aa..cc1b0de75d4 100644 >--- a/Koha/SearchEngine/Search.pm >+++ b/Koha/SearchEngine/Search.pm >@@ -45,7 +45,7 @@ Creates a new C<Search> of whatever the relevant type is. > > use Modern::Perl; > use C4::Context; >-use C4::Biblio qw//; >+use C4::Biblio qw( GetMarcFromKohaField ); > use POSIX qw(ceil floor); > > sub new { >diff --git a/Koha/UploadedFiles.pm b/Koha/UploadedFiles.pm >index 2f44e974c84..60c10d15c6f 100644 >--- a/Koha/UploadedFiles.pm >+++ b/Koha/UploadedFiles.pm >@@ -19,7 +19,7 @@ package Koha::UploadedFiles; > > use Modern::Perl; > >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use Koha::Database; > use Koha::DateUtils; > use Koha::UploadedFile; >diff --git a/Koha/Virtualshelf.pm b/Koha/Virtualshelf.pm >index c27c695ada6..d0ccb880817 100644 >--- a/Koha/Virtualshelf.pm >+++ b/Koha/Virtualshelf.pm >@@ -19,7 +19,7 @@ use Modern::Perl; > > use Carp; > >-use C4::Auth; >+use C4::Auth qw( haspermission ); > > use Koha::Patrons; > use Koha::Database; >diff --git a/Koha/Z3950Responder/Session.pm b/Koha/Z3950Responder/Session.pm >index 006bfaf2acf..6f663b5f95c 100644 >--- a/Koha/Z3950Responder/Session.pm >+++ b/Koha/Z3950Responder/Session.pm >@@ -22,7 +22,7 @@ use Modern::Perl; > use C4::Circulation qw( GetTransfers ); > use C4::Context; > use C4::Reserves qw( GetReserveStatus ); >-use C4::Search qw(); >+use C4::Search qw( new_record_from_zebra ); > > use Koha::Items; > use Koha::Logger; >diff --git a/about.pl b/about.pl >index a814acc88f5..0e9eed8931b 100755 >--- a/about.pl >+++ b/about.pl >@@ -36,8 +36,8 @@ use Try::Tiny; > use YAML::XS; > use Encode; > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user get_user_subpermissions ); > use C4::Context; > use C4::Installer::PerlModules; > >@@ -56,7 +56,7 @@ use Koha::SearchEngine::Elasticsearch; > use Koha::Logger; > use Koha::Filter::MARC::ViewPolicy; > >-use C4::Members::Statistics; >+use C4::Members::Statistics qw( get_fields ); > > > #use Smart::Comments '####'; >diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl >index 66572f0b997..00e4699ec53 100755 >--- a/acqui/acqui-home.pl >+++ b/acqui/acqui-home.pl >@@ -29,8 +29,8 @@ this script is the main page for acqui > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > use C4::Budgets; > use C4::Members; >diff --git a/acqui/add_user_search.pl b/acqui/add_user_search.pl >index ea7b2ae9d7e..9afa7503598 100755 >--- a/acqui/add_user_search.pl >+++ b/acqui/add_user_search.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/acqui/addorder.pl b/acqui/addorder.pl >index 417c57d2616..8aeae1bb3f9 100755 >--- a/acqui/addorder.pl >+++ b/acqui/addorder.pl >@@ -120,13 +120,13 @@ if it is an order from an existing suggestion : the id of this suggestion. > use Modern::Perl; > use CGI qw ( -utf8 ); > use JSON qw ( to_json ); >-use C4::Auth; # get_template_and_user >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; # ModOrder > use C4::Suggestions; # ModStatus >-use C4::Biblio; # AddBiblio TransformKohaToMarc >+use C4::Biblio qw( TransformHtmlToXml TransformKohaToMarc AddBiblio GetMarcFromKohaField ); > use C4::Budgets; >-use C4::Items; >-use C4::Output; >+use C4::Items qw( sub AddItemFromMarc ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Log qw(logaction); > use Koha::Acquisition::Currencies; > use Koha::Acquisition::Orders; >diff --git a/acqui/addorderiso2709.pl b/acqui/addorderiso2709.pl >index 0e3df3ba043..5f4e65534e9 100755 >--- a/acqui/addorderiso2709.pl >+++ b/acqui/addorderiso2709.pl >@@ -29,14 +29,14 @@ use List::MoreUtils qw/uniq/; > use Encode; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >-use C4::ImportBatch; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::ImportBatch qw( GetImportRecordsRange GetImportRecordMarc GetImportRecordMatches sub SetImportRecordStatus SetMatchedBiblionumber SetImportBatchStatus GetImportBatch GetImportBatchRangeDesc GetNumberOfNonZ3950ImportBatches GetImportBatchOverlayAction GetImportBatchNoMatchAction GetImportBatchItemAction ); > use C4::Matcher; >-use C4::Search qw/FindDuplicate/; >+use C4::Search qw( FindDuplicate ); > use C4::Acquisition; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetMarcQuantity GetMarcFromKohaField AddBiblio GetMarcPrice TransformHtmlToXml ); >+use C4::Items qw( PrepareItemrecordDisplay sub AddItemFromMarc ); > use C4::Koha; > use C4::Budgets; > use C4::Acquisition; >diff --git a/acqui/ajax-getauthvaluedropbox.pl b/acqui/ajax-getauthvaluedropbox.pl >index 41c0a8db413..6d7034b8232 100755 >--- a/acqui/ajax-getauthvaluedropbox.pl >+++ b/acqui/ajax-getauthvaluedropbox.pl >@@ -48,8 +48,8 @@ Default value for the dropbox. > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Charset; >-use C4::Auth qw/check_api_auth/; >+use C4::Charset qw( NormalizeString ); >+use C4::Auth qw( check_api_auth ); > use Koha::AuthorisedValues; > > my $query = CGI->new(); >diff --git a/acqui/basket.pl b/acqui/basket.pl >index 015f27a6b56..a82be8cc796 100755 >--- a/acqui/basket.pl >+++ b/acqui/basket.pl >@@ -21,26 +21,26 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user haspermission ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers output_and_exit ); > use CGI qw ( -utf8 ); > use C4::Acquisition; > use C4::Budgets; > use C4::Contract; > use C4::Debug; > use C4::Biblio; >-use C4::Items; >+use C4::Items qw( sub ); > use C4::Suggestions; > use Koha::Biblios; > use Koha::Acquisition::Baskets; > use Koha::Acquisition::Booksellers; > use Koha::Acquisition::Orders; > use Koha::Libraries; >-use C4::Letters qw/SendAlerts/; >+use C4::Letters qw( SendAlerts ); > use Date::Calc qw/Add_Delta_Days/; > use Koha::Database; >-use Koha::EDI qw( create_edi_order get_edifact_ean ); >+use Koha::EDI qw( create_edi_order ); > use Koha::CsvProfiles; > use Koha::Patrons; > >diff --git a/acqui/basketgroup.pl b/acqui/basketgroup.pl >index 69cf5b0378c..ccbcf591e62 100755 >--- a/acqui/basketgroup.pl >+++ b/acqui/basketgroup.pl >@@ -46,13 +46,13 @@ The bookseller who we want to display the baskets (and basketgroups) of. > use Modern::Perl; > use Carp; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use File::Spec; > > use C4::Acquisition qw/CloseBasketgroup ReOpenBasketgroup GetOrders GetBasketsByBasketgroup GetBasketsByBookseller ModBasketgroup NewBasketgroup DelBasketgroup GetBasketgroups ModBasket GetBasketgroup GetBasket GetBasketGroupAsCSV get_rounded_price/; >-use Koha::EDI qw/create_edi_order get_edifact_ean/; >+use Koha::EDI qw( get_edifact_ean create_edi_order ); > > use Koha::Biblioitems; > use Koha::Acquisition::Booksellers; >diff --git a/acqui/basketheader.pl b/acqui/basketheader.pl >index f06900ce85b..cc328931b0b 100755 >--- a/acqui/basketheader.pl >+++ b/acqui/basketheader.pl >@@ -48,8 +48,8 @@ If it exists, C<$basketno> is the basket we edit > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition qw/GetBasket NewBasket ModBasketHeader/; > use C4::Contract qw/GetContracts/; > >diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl >index 9b15aac94ce..2e0a9944901 100755 >--- a/acqui/booksellers.pl >+++ b/acqui/booksellers.pl >@@ -52,10 +52,10 @@ The id of the supplier whose baskets we will display > =cut > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; > use C4::Budgets; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > > use C4::Acquisition qw/ GetBasketsInfosByBookseller CanUserManageBasket /; >diff --git a/acqui/cancelorder.pl b/acqui/cancelorder.pl >index d5b57f81d68..ae40054e15c 100755 >--- a/acqui/cancelorder.pl >+++ b/acqui/cancelorder.pl >@@ -32,8 +32,8 @@ and add possibility to indicate a reason for cancellation > use Modern::Perl; > > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > use Koha::Acquisition::Baskets; > >diff --git a/acqui/check_budget_total.pl b/acqui/check_budget_total.pl >index b502a1dd626..03ddbacee0b 100755 >--- a/acqui/check_budget_total.pl >+++ b/acqui/check_budget_total.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Budgets; > > =head1 DESCRIPTION >diff --git a/acqui/check_uniqueness.pl b/acqui/check_uniqueness.pl >index 37c4a22204e..a564a325e5a 100755 >--- a/acqui/check_uniqueness.pl >+++ b/acqui/check_uniqueness.pl >@@ -33,8 +33,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use JSON; >-use C4::Output; >-use C4::Items; >+use C4::Output qw( output_with_http_headers ); >+use C4::Items qw( SearchItems ); > > my $input = CGI->new; > my @field = $input->multi_param('field[]'); >diff --git a/acqui/duplicate_orders.pl b/acqui/duplicate_orders.pl >index 7bbefea2ead..fdda9c50875 100755 >--- a/acqui/duplicate_orders.pl >+++ b/acqui/duplicate_orders.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Acquisition qw(GetHistory); > use C4::Budgets qw(GetBudgetPeriods GetBudgetHierarchy CanUserUseBudget); > use Koha::Acquisition::Baskets; >diff --git a/acqui/edi_ean.pl b/acqui/edi_ean.pl >index 6ed67916c91..76d61f8b497 100755 >--- a/acqui/edi_ean.pl >+++ b/acqui/edi_ean.pl >@@ -23,9 +23,9 @@ > # > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; > use CGI; > my $schema = Koha::Database->new()->schema(); >diff --git a/acqui/edifactmsgs.pl b/acqui/edifactmsgs.pl >index 1f303f99bf6..8d85e72784d 100755 >--- a/acqui/edifactmsgs.pl >+++ b/acqui/edifactmsgs.pl >@@ -20,11 +20,11 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; >-use Koha::EDI qw(process_invoice); >+use Koha::EDI qw( process_invoice ); > > my $q = CGI->new; > my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( >diff --git a/acqui/edimsg.pl b/acqui/edimsg.pl >index d5b84d26d61..9827def3a4b 100755 >--- a/acqui/edimsg.pl >+++ b/acqui/edimsg.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > use CGI; > use Koha::Database; > use C4::Koha; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $q = CGI->new; > my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( >diff --git a/acqui/finishreceive.pl b/acqui/finishreceive.pl >index 961e3d566f0..0b37dca95e9 100755 >--- a/acqui/finishreceive.pl >+++ b/acqui/finishreceive.pl >@@ -22,12 +22,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Output; > use C4::Context; > use C4::Acquisition; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetFrameworkCode GetMarcFromKohaField TransformHtmlToXml ); >+use C4::Items qw( sub GetMarcItem ModItemFromMarc AddItemFromMarc ); > use C4::Search; > > use Koha::Number::Price; >diff --git a/acqui/histsearch.pl b/acqui/histsearch.pl >index de42d4222f8..3ea062b76d9 100755 >--- a/acqui/histsearch.pl >+++ b/acqui/histsearch.pl >@@ -51,8 +51,8 @@ to filter on ended date. > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; # get_template_and_user >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > use C4::Debug; > use C4::Koha; >diff --git a/acqui/invoice-files.pl b/acqui/invoice-files.pl >index d80ee02d7ef..2b91e1619f9 100755 >--- a/acqui/invoice-files.pl >+++ b/acqui/invoice-files.pl >@@ -30,8 +30,8 @@ Manage files associated with invoice > use Modern::Perl; > > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > use Koha::Misc::Files; > >diff --git a/acqui/invoice.pl b/acqui/invoice.pl >index 669dd26a962..d8b4a468911 100755 >--- a/acqui/invoice.pl >+++ b/acqui/invoice.pl >@@ -29,8 +29,8 @@ Invoice details > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Acquisition; > use C4::Budgets; > >diff --git a/acqui/invoices.pl b/acqui/invoices.pl >index 85e066094db..82144f0298f 100755 >--- a/acqui/invoices.pl >+++ b/acqui/invoices.pl >@@ -29,8 +29,8 @@ Search for invoices > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use C4::Acquisition qw/GetInvoices/; > use C4::Budgets; >diff --git a/acqui/lateorders-export.pl b/acqui/lateorders-export.pl >index 57a080dbd31..64a881e5d7e 100755 >--- a/acqui/lateorders-export.pl >+++ b/acqui/lateorders-export.pl >@@ -19,7 +19,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; > use C4::Output; > use C4::Context; >diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl >index be12b3253b7..d4e2e7a8666 100755 >--- a/acqui/lateorders.pl >+++ b/acqui/lateorders.pl >@@ -45,12 +45,12 @@ To know on which branch this script have to display late order. > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Acquisition; >-use C4::Letters; >+use C4::Letters qw( SendAlerts GetLetters ); > use Koha::DateUtils; > use Koha::Acquisition::Orders; > use Koha::CsvProfiles; >diff --git a/acqui/modordernotes.pl b/acqui/modordernotes.pl >index ab7817eb700..ee407feb852 100755 >--- a/acqui/modordernotes.pl >+++ b/acqui/modordernotes.pl >@@ -29,8 +29,8 @@ Modify just notes when basket is closed. > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > > use Koha::Acquisition::Booksellers; >diff --git a/acqui/neworderempty.pl b/acqui/neworderempty.pl >index 4a6a07f32bc..ccbe9defd8c 100755 >--- a/acqui/neworderempty.pl >+++ b/acqui/neworderempty.pl >@@ -68,21 +68,21 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Budgets; > > use C4::Acquisition; > use C4::Contract; > use C4::Suggestions; # GetSuggestion >-use C4::Biblio; # GetBiblioData GetMarcPrice >-use C4::Items; #PrepareItemRecord >-use C4::Output; >+use C4::Biblio qw( AddBiblio GetMarcPrice GetMarcStructure GetMarcFromKohaField GetBiblioData IsMarcStructureInternal GetMarcBiblio ); >+use C4::Items qw( sub ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Koha; > use C4::Members; >-use C4::Search qw/FindDuplicate/; >+use C4::Search qw( FindDuplicate ); > > #needed for z3950 import: >-use C4::ImportBatch qw/GetImportRecordMarc SetImportRecordStatus SetMatchedBiblionumber/; >+use C4::ImportBatch qw( sub SetImportRecordStatus SetMatchedBiblionumber GetImportRecordMarc ); > > use Koha::Acquisition::Booksellers; > use Koha::Acquisition::Currencies; >diff --git a/acqui/newordersubscription.pl b/acqui/newordersubscription.pl >index 7d3e8ba40d7..87d2cb3221a 100755 >--- a/acqui/newordersubscription.pl >+++ b/acqui/newordersubscription.pl >@@ -20,10 +20,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Acquisition; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::Serials; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Serials qw( SearchSubscriptions subscriptionCurrentlyOnOrder check_routing ); > > use Koha::Acquisition::Booksellers; > >diff --git a/acqui/newordersuggestion.pl b/acqui/newordersuggestion.pl >index f43e201c069..8606d22f62e 100755 >--- a/acqui/newordersuggestion.pl >+++ b/acqui/newordersuggestion.pl >@@ -91,8 +91,8 @@ can be equal to > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; # get_template_and_user >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Suggestions; > use C4::Biblio; > use C4::Budgets; >diff --git a/acqui/ordered.pl b/acqui/ordered.pl >index 7f17310532e..f49b502f06d 100755 >--- a/acqui/ordered.pl >+++ b/acqui/ordered.pl >@@ -30,8 +30,8 @@ this script is to show orders ordered but not yet received > use C4::Context; > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Acquisition::Invoice::Adjustments; > use C4::Acquisition; > >diff --git a/acqui/orderreceive.pl b/acqui/orderreceive.pl >index 9d9028c64f7..84b72063061 100755 >--- a/acqui/orderreceive.pl >+++ b/acqui/orderreceive.pl >@@ -63,12 +63,12 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Acquisition; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Budgets qw/ GetBudget GetBudgetHierarchy CanUserUseBudget GetBudgetPeriods /; > use C4::Members; >-use C4::Items; >-use C4::Biblio; >+use C4::Items qw( sub ); >+use C4::Biblio qw( GetMarcStructure ); > use C4::Suggestions; > use C4::Koha; > >diff --git a/acqui/parcel.pl b/acqui/parcel.pl >index 1e42ed91740..7317e056da4 100755 >--- a/acqui/parcel.pl >+++ b/acqui/parcel.pl >@@ -56,13 +56,13 @@ To filter the results list on this given date. > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; > use C4::Budgets; > use C4::Biblio; >-use C4::Items; >+use C4::Items qw( sub ); > use CGI qw ( -utf8 ); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Suggestions; > > use Koha::Acquisition::Baskets; >diff --git a/acqui/parcels.pl b/acqui/parcels.pl >index 139cc0bb2eb..8f837915813 100755 >--- a/acqui/parcels.pl >+++ b/acqui/parcels.pl >@@ -68,8 +68,8 @@ To know how many results have to be display / page. > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use C4::Acquisition; > use C4::Budgets; >diff --git a/acqui/showorder.pl b/acqui/showorder.pl >index 89255c94e71..da7cce55b16 100755 >--- a/acqui/showorder.pl >+++ b/acqui/showorder.pl >@@ -18,8 +18,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Acquisition::Orders; > use Koha::Patrons; >diff --git a/acqui/spent.pl b/acqui/spent.pl >index f90671b3ebf..36418502352 100755 >--- a/acqui/spent.pl >+++ b/acqui/spent.pl >@@ -30,8 +30,8 @@ this script is designed to show the spent amount in budgets > =cut > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Acquisition; >diff --git a/acqui/supplier.pl b/acqui/supplier.pl >index 18e9b705ddd..8733d663cd3 100755 >--- a/acqui/supplier.pl >+++ b/acqui/supplier.pl >@@ -41,10 +41,10 @@ To know the bookseller this script has to display details. > =cut > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Contract; > use C4::Biblio; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > > use C4::Budgets; >diff --git a/acqui/transferorder.pl b/acqui/transferorder.pl >index 433821b5874..ca3e5fb8339 100755 >--- a/acqui/transferorder.pl >+++ b/acqui/transferorder.pl >@@ -22,8 +22,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Acquisition; > use Koha::Acquisition::Booksellers; >diff --git a/acqui/uncertainprice.pl b/acqui/uncertainprice.pl >index 82b98b2d3d5..8a1dee628d8 100755 >--- a/acqui/uncertainprice.pl >+++ b/acqui/uncertainprice.pl >@@ -45,8 +45,8 @@ The bookseller who we want to display the orders of. > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > > use C4::Acquisition qw/SearchOrders GetOrder ModOrder/; >diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl >index 60c65e49674..51d55ba6a1b 100755 >--- a/acqui/updatesupplier.pl >+++ b/acqui/updatesupplier.pl >@@ -49,7 +49,7 @@ contact_serialsprimary. > use Modern::Perl; > use List::Util; > use C4::Context; >-use C4::Auth; >+use C4::Auth qw( checkauth ); > > use C4::Biblio; > use C4::Output; >diff --git a/acqui/z3950_search.pl b/acqui/z3950_search.pl >index 10399d57551..096bff4ef04 100755 >--- a/acqui/z3950_search.pl >+++ b/acqui/z3950_search.pl >@@ -22,10 +22,10 @@ > use Modern::Perl; > use CGI qw/-utf8/; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Breeding; >+use C4::Breeding qw( Z3950Search ); > use C4::Koha; > > use Koha::Acquisition::Booksellers; >diff --git a/admin/add_user_search.pl b/admin/add_user_search.pl >index 027eb15e683..032301a6d7f 100755 >--- a/admin/add_user_search.pl >+++ b/admin/add_user_search.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/admin/additional-fields.pl b/admin/additional-fields.pl >index e124878dd55..e7de2869dc6 100755 >--- a/admin/additional-fields.pl >+++ b/admin/additional-fields.pl >@@ -18,9 +18,9 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::AdditionalFields; > > my $input = CGI->new; >diff --git a/admin/admin-home.pl b/admin/admin-home.pl >index 23c92f3b4cf..79dc0550b21 100755 >--- a/admin/admin-home.pl >+++ b/admin/admin-home.pl >@@ -18,8 +18,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Plugins; > > my $query = CGI->new; >diff --git a/admin/adveditorshortcuts.pl b/admin/adveditorshortcuts.pl >index 5910d3fd86a..4cd4d71f691 100755 >--- a/admin/adveditorshortcuts.pl >+++ b/admin/adveditorshortcuts.pl >@@ -36,9 +36,9 @@ This script allows the user to redefine the keyboard shortcuts for the advacned > use Modern::Perl; > use Encode; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Koha; > use Koha::KeyboardShortcuts; >diff --git a/admin/aqbudgetperiods.pl b/admin/aqbudgetperiods.pl >index c96170dddf0..5043480d83a 100755 >--- a/admin/aqbudgetperiods.pl >+++ b/admin/aqbudgetperiods.pl >@@ -52,8 +52,8 @@ use Koha::DateUtils; > use Koha::Database; > use C4::Koha; > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; > use C4::Budgets; > use C4::Debug; >diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl >index 16f62c5e79c..5303773cf65 100755 >--- a/admin/aqbudgets.pl >+++ b/admin/aqbudgets.pl >@@ -25,12 +25,12 @@ use CGI qw ( -utf8 ); > use List::Util qw/min/; > > use Koha::Database; >-use C4::Auth qw/get_user_subpermissions/; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; > use C4::Budgets; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers output_and_exit ); > use C4::Koha; > use C4::Debug; > use Koha::Acquisition::Currencies; >diff --git a/admin/aqcontract.pl b/admin/aqcontract.pl >index 9bd4d474814..0a6209c6b09 100755 >--- a/admin/aqcontract.pl >+++ b/admin/aqcontract.pl >@@ -23,8 +23,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Contract; > use Koha::DateUtils; > >diff --git a/admin/aqplan.pl b/admin/aqplan.pl >index 5c85b7d7e0e..ba58fc0bc42 100755 >--- a/admin/aqplan.pl >+++ b/admin/aqplan.pl >@@ -30,9 +30,9 @@ use Text::CSV_XS; > use C4::Acquisition; > use C4::Budgets; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use Koha::Acquisition::Currencies; > >diff --git a/admin/audio_alerts.pl b/admin/audio_alerts.pl >index 793d2d1eeac..7ac73ed978b 100755 >--- a/admin/audio_alerts.pl >+++ b/admin/audio_alerts.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::AudioAlert; > use Koha::AudioAlerts; > >diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl >index 817bf59d09a..2bee6f98d99 100755 >--- a/admin/auth_subfields_structure.pl >+++ b/admin/auth_subfields_structure.pl >@@ -18,8 +18,8 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Koha; >diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl >index a034d6fbbf9..1346cbe3354 100755 >--- a/admin/auth_tag_structure.pl >+++ b/admin/auth_tag_structure.pl >@@ -20,10 +20,10 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use Koha::Authority::Types; >diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl >index 62cabcc1b32..d0de42265ef 100755 >--- a/admin/authorised_values.pl >+++ b/admin/authorised_values.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use List::MoreUtils qw(any); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Koha; >-use C4::Output; >+use C4::Koha qw( getImageSets getitemtypeimagelocation ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::AuthorisedValues; > use Koha::AuthorisedValueCategories; >diff --git a/admin/authtypes.pl b/admin/authtypes.pl >index 4d032cfc03c..3a12bc2576c 100755 >--- a/admin/authtypes.pl >+++ b/admin/authtypes.pl >@@ -22,8 +22,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Authorities; > use Koha::Authority::Types; >diff --git a/admin/background_jobs.pl b/admin/background_jobs.pl >index 1835e831e44..9ed3ac7f82f 100755 >--- a/admin/background_jobs.pl >+++ b/admin/background_jobs.pl >@@ -21,8 +21,8 @@ use JSON qw( decode_json ); > use Try::Tiny; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::BackgroundJobs; > use Koha::Virtualshelves; >diff --git a/admin/biblio_framework.pl b/admin/biblio_framework.pl >index 20e40ef3b75..51ff83dd950 100755 >--- a/admin/biblio_framework.pl >+++ b/admin/biblio_framework.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Biblios; > use Koha::BiblioFramework; > use Koha::BiblioFrameworks; >diff --git a/admin/branch_transfer_limits.pl b/admin/branch_transfer_limits.pl >index 94a348e1206..c967c3e9a73 100755 >--- a/admin/branch_transfer_limits.pl >+++ b/admin/branch_transfer_limits.pl >@@ -21,11 +21,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; >-use C4::Circulation qw{ IsBranchTransferAllowed DeleteBranchTransferLimits CreateBranchTransferLimit }; >+use C4::Circulation qw( DeleteBranchTransferLimits CreateBranchTransferLimit IsBranchTransferAllowed ); > > my $input = CGI->new; > >diff --git a/admin/branches.pl b/admin/branches.pl >index 9bcb379178b..860ed434891 100755 >--- a/admin/branches.pl >+++ b/admin/branches.pl >@@ -23,9 +23,9 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Try::Tiny; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > > use Koha::Database; >diff --git a/admin/cash_registers.pl b/admin/cash_registers.pl >index ae39c119864..f76d73bd8bc 100755 >--- a/admin/cash_registers.pl >+++ b/admin/cash_registers.pl >@@ -23,11 +23,11 @@ use warnings; > use CGI; > use Try::Tiny; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use Koha::Libraries; > use C4::Koha; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Cash::Registers; > > my $cgi = CGI->new(); >diff --git a/admin/categories.pl b/admin/categories.pl >index afc29504686..b57ecc500b2 100755 >--- a/admin/categories.pl >+++ b/admin/categories.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Form::MessagingPreferences; > use Koha::Patrons; > use Koha::Database; >diff --git a/admin/check_budget_parent.pl b/admin/check_budget_parent.pl >index a80c55d1035..f4b73d6804d 100755 >--- a/admin/check_budget_parent.pl >+++ b/admin/check_budget_parent.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Budgets; > > =head1 DESCRIPTION >diff --git a/admin/check_parent_total.pl b/admin/check_parent_total.pl >index 49d4ba7be8a..c4bbedc0fe4 100755 >--- a/admin/check_parent_total.pl >+++ b/admin/check_parent_total.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Budgets; > > =head1 DESCRIPTION >diff --git a/admin/checkmarc.pl b/admin/checkmarc.pl >index d492374184d..4d9d85143a1 100755 >--- a/admin/checkmarc.pl >+++ b/admin/checkmarc.pl >@@ -19,8 +19,8 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Biblio; >diff --git a/admin/cities.pl b/admin/cities.pl >index eda3dc1d06e..c81a2c472d6 100755 >--- a/admin/cities.pl >+++ b/admin/cities.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Cities; > >diff --git a/admin/classsources.pl b/admin/classsources.pl >index 02b3e0e4494..3525f36131a 100755 >--- a/admin/classsources.pl >+++ b/admin/classsources.pl >@@ -21,12 +21,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; >-use C4::ClassSortRoutine; >-use C4::ClassSplitRoutine; >+use C4::ClassSortRoutine qw( GetSortRoutineNames ); >+use C4::ClassSplitRoutine qw( GetSplitRoutineNames ); > use Koha::ClassSources; > use Koha::ClassSortRules; > use Koha::ClassSplitRules; >diff --git a/admin/clone-rules.pl b/admin/clone-rules.pl >index 7592c4da60d..1acff309113 100755 >--- a/admin/clone-rules.pl >+++ b/admin/clone-rules.pl >@@ -28,8 +28,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Debug; > use Koha::CirculationRules; >diff --git a/admin/columns_settings.pl b/admin/columns_settings.pl >index 2c185f8e7e9..de9aeb9b947 100755 >--- a/admin/columns_settings.pl >+++ b/admin/columns_settings.pl >@@ -2,9 +2,9 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Utils::DataTables::TablesSettings qw( get_modules ); > my $input = CGI->new; > >diff --git a/admin/credit_types.pl b/admin/credit_types.pl >index 48ec9b49d49..f344f353ae4 100755 >--- a/admin/credit_types.pl >+++ b/admin/credit_types.pl >@@ -22,8 +22,8 @@ use CGI qw ( -utf8 ); > use Try::Tiny; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Account::CreditType; > use Koha::Account::CreditTypes; >diff --git a/admin/currency.pl b/admin/currency.pl >index d3dfab5e458..28dc2d26735 100755 >--- a/admin/currency.pl >+++ b/admin/currency.pl >@@ -21,9 +21,9 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Acquisition::Booksellers; > use Koha::Acquisition::Currencies; >diff --git a/admin/debit_types.pl b/admin/debit_types.pl >index 7d0f6e840f9..5760b5eab29 100755 >--- a/admin/debit_types.pl >+++ b/admin/debit_types.pl >@@ -22,8 +22,8 @@ use CGI qw ( -utf8 ); > use Try::Tiny; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Account::DebitType; > use Koha::Account::DebitTypes; >diff --git a/admin/desks.pl b/admin/desks.pl >index 352ff8ba50b..6440884b2eb 100755 >--- a/admin/desks.pl >+++ b/admin/desks.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Desks; > >diff --git a/admin/didyoumean.pl b/admin/didyoumean.pl >index 9ac72dd51e9..ab2c34dd425 100755 >--- a/admin/didyoumean.pl >+++ b/admin/didyoumean.pl >@@ -3,8 +3,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::SuggestionEngine; > use Module::Load::Conditional qw(can_load); > use JSON; >diff --git a/admin/edi_accounts.pl b/admin/edi_accounts.pl >index 288fec519c2..293f7ef6662 100755 >--- a/admin/edi_accounts.pl >+++ b/admin/edi_accounts.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; > use Koha::Plugins; > >diff --git a/admin/edi_ean_accounts.pl b/admin/edi_ean_accounts.pl >index a7edcf25f20..87ebe458c71 100755 >--- a/admin/edi_ean_accounts.pl >+++ b/admin/edi_ean_accounts.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; > > my $input = CGI->new(); >diff --git a/admin/import_export_framework.pl b/admin/import_export_framework.pl >index bd5ee8331b0..45ba9e2ba2c 100755 >--- a/admin/import_export_framework.pl >+++ b/admin/import_export_framework.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use CGI::Cookie; > use C4::Context; >-use C4::Auth qw/check_cookie_auth/; >-use C4::ImportExportFramework; >+use C4::Auth qw( check_cookie_auth ); >+use C4::ImportExportFramework qw( ExportFramework createODS ImportFramework ); > > my %cookies = CGI::Cookie->fetch(); > my $authenticated = 0; >diff --git a/admin/item_circulation_alerts.pl b/admin/item_circulation_alerts.pl >index ae6692d058d..ba9dd5b3c91 100755 >--- a/admin/item_circulation_alerts.pl >+++ b/admin/item_circulation_alerts.pl >@@ -23,10 +23,10 @@ use Encode; > use JSON; > #use Data::Dump 'pp'; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::ItemCirculationAlertPreference; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::ItemTypes; > use Koha::Patron::Categories; >diff --git a/admin/items_search_field.pl b/admin/items_search_field.pl >index ab48babd865..569dce65bbc 100755 >--- a/admin/items_search_field.pl >+++ b/admin/items_search_field.pl >@@ -19,8 +19,8 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Item::Search::Field qw(GetItemSearchField ModItemSearchField); > >diff --git a/admin/items_search_fields.pl b/admin/items_search_fields.pl >index ac2548642b2..0e62eb67c66 100755 >--- a/admin/items_search_fields.pl >+++ b/admin/items_search_fields.pl >@@ -19,8 +19,8 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Item::Search::Field qw(AddItemSearchField GetItemSearchFields DelItemSearchField); > >diff --git a/admin/itemtypes.pl b/admin/itemtypes.pl >index 48e80f79ddb..dfec5f1e6ee 100755 >--- a/admin/itemtypes.pl >+++ b/admin/itemtypes.pl >@@ -27,10 +27,10 @@ use CGI qw ( -utf8 ); > > use File::Spec; > >-use C4::Koha; >+use C4::Koha qw( getImageSets GetAuthorisedValues ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::ItemTypes; > use Koha::ItemType; > use Koha::Localizations; >diff --git a/admin/koha2marclinks.pl b/admin/koha2marclinks.pl >index 5c679b885ca..516bf28c19d 100755 >--- a/admin/koha2marclinks.pl >+++ b/admin/koha2marclinks.pl >@@ -22,9 +22,9 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use Koha::Database; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::BiblioFrameworks; > use Koha::Caches; > use Koha::MarcSubfieldStructures; >diff --git a/admin/library_groups.pl b/admin/library_groups.pl >index ec7064504d6..3cd076faceb 100755 >--- a/admin/library_groups.pl >+++ b/admin/library_groups.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Libraries; > use Koha::Library::Group; >diff --git a/admin/localization.pl b/admin/localization.pl >index 81272d8c903..26b08709c58 100755 >--- a/admin/localization.pl >+++ b/admin/localization.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Localization; > use Koha::Localizations; >diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl >index 908b77d13b9..c376ac6c49b 100755 >--- a/admin/marc_subfields_structure.pl >+++ b/admin/marc_subfields_structure.pl >@@ -18,8 +18,8 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > >diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl >index 634ea5e9857..4522b508968 100755 >--- a/admin/marctagstructure.pl >+++ b/admin/marctagstructure.pl >@@ -20,10 +20,10 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use Koha::Caches; >diff --git a/admin/matching-rules.pl b/admin/matching-rules.pl >index eb308dde4aa..5c5b7bdbed1 100755 >--- a/admin/matching-rules.pl >+++ b/admin/matching-rules.pl >@@ -21,9 +21,9 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use C4::Matcher qw/valid_normalization_routines/; > >diff --git a/admin/oai_set_mappings.pl b/admin/oai_set_mappings.pl >index d322494f5ca..2b828faa520 100755 >--- a/admin/oai_set_mappings.pl >+++ b/admin/oai_set_mappings.pl >@@ -33,8 +33,8 @@ the OR operator will be applied. > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::OAI::Sets; > > use Data::Dumper; >diff --git a/admin/oai_sets.pl b/admin/oai_sets.pl >index 5f241856d1a..65a756a9237 100755 >--- a/admin/oai_sets.pl >+++ b/admin/oai_sets.pl >@@ -29,8 +29,8 @@ Admin page to describe OAI SETs > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::OAI::Sets; > > use Data::Dumper; >diff --git a/admin/overdrive.pl b/admin/overdrive.pl >index ef12d60ed8d..3bff6dae746 100755 >--- a/admin/overdrive.pl >+++ b/admin/overdrive.pl >@@ -19,9 +19,9 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Libraries; > use Koha::Library::OverDriveInfos; >diff --git a/admin/patron-attr-types.pl b/admin/patron-attr-types.pl >index f0c1654cc33..a02f991d7e2 100755 >--- a/admin/patron-attr-types.pl >+++ b/admin/patron-attr-types.pl >@@ -24,9 +24,9 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use List::MoreUtils qw/uniq/; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use Koha::Patron::Attribute::Types; > >diff --git a/admin/preferences.pl b/admin/preferences.pl >index 20f9f6f4cd2..f9f16dafab4 100755 >--- a/admin/preferences.pl >+++ b/admin/preferences.pl >@@ -20,13 +20,13 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Koha; >-use C4::Languages qw(getTranslatedLanguages); >-use C4::ClassSource; >+use C4::Koha qw( getallthemes ); >+use C4::Languages qw( getTranslatedLanguages ); >+use C4::ClassSource qw( GetClassSources GetClassSource ); > use C4::Log; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Templates; > use Koha::Acquisition::Currencies; > use File::Spec; >diff --git a/admin/share_content.pl b/admin/share_content.pl >index 0996f16c07c..5bd9d2caca8 100755 >--- a/admin/share_content.pl >+++ b/admin/share_content.pl >@@ -21,8 +21,8 @@ use CGI qw ( -utf8 ); > use JSON; > use HTTP::Request; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::SharedContent; > >diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl >index b1fa57b4da1..027c969bc05 100755 >--- a/admin/smart-rules.pl >+++ b/admin/smart-rules.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Debug; > use Koha::DateUtils; >diff --git a/admin/sms_providers.pl b/admin/sms_providers.pl >index 7c39c30c356..bea1805e6db 100755 >--- a/admin/sms_providers.pl >+++ b/admin/sms_providers.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > use CGI; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::SMS::Provider; > use Koha::SMS::Providers; >diff --git a/admin/smtp_servers.pl b/admin/smtp_servers.pl >index 19458a23a42..14992a45ff9 100755 >--- a/admin/smtp_servers.pl >+++ b/admin/smtp_servers.pl >@@ -23,8 +23,8 @@ use CGI qw ( -utf8 ); > use Scalar::Util qw(blessed); > use Try::Tiny; > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Libraries; > use Koha::SMTP::Servers; >diff --git a/admin/sru_modmapping.pl b/admin/sru_modmapping.pl >index 298a4f57897..67023772e39 100755 >--- a/admin/sru_modmapping.pl >+++ b/admin/sru_modmapping.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > # Initialize CGI, template > >diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl >index 160b6fdbaa1..0665effe352 100755 >--- a/admin/systempreferences.pl >+++ b/admin/systempreferences.pl >@@ -44,12 +44,12 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use MIME::Base64; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Koha; >-use C4::Languages qw(getTranslatedLanguages); >-use C4::ClassSource; >-use C4::Output; >+use C4::Koha qw( getallthemes ); >+use C4::Languages qw( getTranslatedLanguages ); >+use C4::ClassSource qw( GetClassSources GetClassSource ); >+use C4::Output qw( output_html_with_http_headers ); > use YAML::XS; > > my %tabsysprefs; #we do no longer need to keep track of a tab per pref (yaml) >diff --git a/admin/transfer_limits.pl b/admin/transfer_limits.pl >index 2bca55f4f3e..f22921c89ff 100755 >--- a/admin/transfer_limits.pl >+++ b/admin/transfer_limits.pl >@@ -20,9 +20,9 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use C4::Circulation > qw{ IsBranchTransferAllowed DeleteBranchTransferLimits CreateBranchTransferLimit }; >diff --git a/admin/transport-cost-matrix.pl b/admin/transport-cost-matrix.pl >index e28ee89b798..2305ee3aefb 100755 >--- a/admin/transport-cost-matrix.pl >+++ b/admin/transport-cost-matrix.pl >@@ -20,11 +20,11 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Debug; >-use C4::HoldsQueue qw(TransportCostMatrix UpdateTransportCostMatrix); >+use C4::HoldsQueue qw( TransportCostMatrix UpdateTransportCostMatrix ); > > use Koha::Libraries; > >diff --git a/admin/usage_statistics.pl b/admin/usage_statistics.pl >index cc22948229d..bad5e4d556c 100755 >--- a/admin/usage_statistics.pl >+++ b/admin/usage_statistics.pl >@@ -18,8 +18,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::DateUtils qw( dt_from_string output_pref ); > use Koha::Libraries; > >diff --git a/admin/z3950servers.pl b/admin/z3950servers.pl >index 89c41d50348..6d0f1b2309f 100755 >--- a/admin/z3950servers.pl >+++ b/admin/z3950servers.pl >@@ -27,8 +27,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; > use Koha::Z3950Servers; > >diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl >index ed6774f5999..7c75bbe0baa 100755 >--- a/authorities/auth_finder.pl >+++ b/authorities/auth_finder.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Acquisition; > use C4::Koha; >diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl >index 66083d3285f..829e65c1a17 100755 >--- a/authorities/authorities-home.pl >+++ b/authorities/authorities-home.pl >@@ -24,9 +24,9 @@ use URI::Escape; > use POSIX qw( ceil ); > > use C4::Context; >-use C4::Auth; >-use C4::Output; >-use C4::AuthoritiesMarc; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit pagination_bar output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; > use C4::Koha; > use C4::Biblio; >diff --git a/authorities/authorities.pl b/authorities/authorities.pl >index 3dd39f4e7f2..c3735984ff0 100755 >--- a/authorities/authorities.pl >+++ b/authorities/authorities.pl >@@ -21,16 +21,16 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::AuthoritiesMarc; >-use C4::ImportBatch; #GetImportRecordMarc >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::ImportBatch qw( sub GetImportRecordMarc ); > use C4::Context; > use C4::Koha; > use Date::Calc qw(Today); > use MARC::File::USMARC; > use MARC::File::XML; >-use C4::Biblio; >+use C4::Biblio qw( TransformHtmlToMarc ); > use Koha::Authority::Types; > use Koha::ItemTypes; > use vars qw( $tagslib); >diff --git a/authorities/blinddetail-biblio-search.pl b/authorities/blinddetail-biblio-search.pl >index 478a1bf1fc7..123bf8a3f4c 100755 >--- a/authorities/blinddetail-biblio-search.pl >+++ b/authorities/blinddetail-biblio-search.pl >@@ -38,10 +38,10 @@ parameters tables. > > use Modern::Perl; > >-use C4::AuthoritiesMarc; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use MARC::Record; > use C4::Koha; >diff --git a/authorities/detail-biblio-search.pl b/authorities/detail-biblio-search.pl >index e2ba88b4dba..b7b3e1ba231 100755 >--- a/authorities/detail-biblio-search.pl >+++ b/authorities/detail-biblio-search.pl >@@ -38,10 +38,10 @@ parameters tables. > > use Modern::Perl; > >-use C4::AuthoritiesMarc; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use MARC::Record; > use C4::Koha; >diff --git a/authorities/detail.pl b/authorities/detail.pl >index 6d8cb14ee12..aa7fdd3f996 100755 >--- a/authorities/detail.pl >+++ b/authorities/detail.pl >@@ -38,13 +38,13 @@ parameters tables. > > use Modern::Perl; > >-use C4::AuthoritiesMarc; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use MARC::Record; >-use C4::Koha; >+use C4::Koha qw( display_marc_indicators ); > use Koha::Authorities; > > use Koha::Authority::Types; >diff --git a/authorities/export.pl b/authorities/export.pl >index ee21e1e14e4..29b45caa49c 100755 >--- a/authorities/export.pl >+++ b/authorities/export.pl >@@ -2,9 +2,9 @@ > use Modern::Perl; > > use C4::Record; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; >-use C4::AuthoritiesMarc; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > > my $query = CGI->new; >diff --git a/authorities/merge.pl b/authorities/merge.pl >index 3b5f6c0fcee..f759d4ff607 100755 >--- a/authorities/merge.pl >+++ b/authorities/merge.pl >@@ -19,11 +19,11 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >-use C4::AuthoritiesMarc; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Biblio; >+use C4::Biblio qw( TransformHtmlToMarc ); > > use Koha::Authority::MergeRequests; > use Koha::Authority::Types; >diff --git a/authorities/merge_ajax.pl b/authorities/merge_ajax.pl >index 6ed427891c2..f764232e0e1 100755 >--- a/authorities/merge_ajax.pl >+++ b/authorities/merge_ajax.pl >@@ -7,8 +7,8 @@ use CGI::Cookie; # need to check cookies before CGI parses the POST request > use JSON; > > use C4::Context; >-use C4::Auth qw/check_cookie_auth/; >-use C4::AuthoritiesMarc; >+use C4::Auth qw( check_cookie_auth ); >+use C4::Auth qw( check_cookie_auth ); > > my %cookies = CGI::Cookie->fetch; > my ($auth_status, $sessionID) = check_cookie_auth($cookies{'CGISESSID'}->value, { editcatalogue => 'edit_catalogue' }); >diff --git a/authorities/ysearch.pl b/authorities/ysearch.pl >index 92de7b1807b..7d743904269 100755 >--- a/authorities/ysearch.pl >+++ b/authorities/ysearch.pl >@@ -32,9 +32,9 @@ use Modern::Perl; > use JSON; > > use C4::Context; >-use C4::Charset; >-use C4::Auth qw/check_cookie_auth/; >-use C4::Output; >+use C4::Charset qw( nsb_clean ); >+use C4::Auth qw( check_cookie_auth ); >+use C4::Output qw( output_with_http_headers ); > use Koha::SearchEngine::Search; > use Koha::SearchEngine::QueryBuilder; > >diff --git a/basket/basket.pl b/basket/basket.pl >index 44727d2364d..50bea3082dd 100755 >--- a/basket/basket.pl >+++ b/basket/basket.pl >@@ -19,10 +19,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Koha; >-use C4::Biblio; >-use C4::Items; >-use C4::Auth; >-use C4::Output; >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetMarcAuthors GetMarcSubjects GetMarcSeries GetMarcUrls ); >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::AuthorisedValues; > use Koha::Biblios; >diff --git a/basket/downloadcart.pl b/basket/downloadcart.pl >index f8478770c2d..506c0ee1069 100755 >--- a/basket/downloadcart.pl >+++ b/basket/downloadcart.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode qw(encode); > >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio ); > use C4::Items; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Record; > use C4::Ris; > >diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl >index 9e273b1f45b..565dd3d0c51 100755 >--- a/basket/sendbasket.pl >+++ b/basket/sendbasket.pl >@@ -22,10 +22,10 @@ use Encode qw(encode); > use Carp; > use Try::Tiny; > >-use C4::Biblio; >-use C4::Items; >-use C4::Auth; >-use C4::Output; >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetMarcAuthors GetMarcSubjects ); >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Templates (); > use Koha::Email; > use Koha::Token; >diff --git a/catalogue/ISBDdetail.pl b/catalogue/ISBDdetail.pl >index d26780a8e2b..103a6d473e0 100755 >--- a/catalogue/ISBDdetail.pl >+++ b/catalogue/ISBDdetail.pl >@@ -36,15 +36,15 @@ This script needs a biblionumber as parameter > use Modern::Perl; > > use HTML::Entities; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Koha; >-use C4::Biblio; >-use C4::Items; >-use C4::Serials; # CountSubscriptionFromBiblionumber >-use C4::Search; # enabled_staff_search_views >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode GetISBDView GetBiblioData ); >+use C4::Items qw( sub ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber GetSubscription GetSubscriptionsFromBiblionumber ); >+use C4::Search qw( z3950_search_args enabled_staff_search_views ); > > use Koha::Biblios; > use Koha::Patrons; >diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl >index 97ce943a2ff..747e65ecbb1 100755 >--- a/catalogue/MARCdetail.pl >+++ b/catalogue/MARCdetail.pl >@@ -47,16 +47,16 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use HTML::Entities; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::Koha; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( display_marc_indicators ); > use MARC::Record; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetFrameworkCode GetMarcBiblio GetMarcStructure GetBiblioData GetAuthorisedValueDesc GetMarcFromKohaField ); >+use C4::Items qw( sub ); > use C4::Acquisition; >-use C4::Serials; #uses getsubscriptionsfrombiblionumber GetSubscriptionsFromBiblionumber >-use C4::Search; # enabled_staff_search_views >+use C4::Serials qw( CountSubscriptionFromBiblionumber GetSubscription GetSubscriptionsFromBiblionumber ); >+use C4::Search qw( z3950_search_args enabled_staff_search_views ); > > use Koha::Biblios; > use Koha::BiblioFrameworks; >diff --git a/catalogue/detail.pl b/catalogue/detail.pl >index 8d06f0da51d..9a8e2e332b7 100755 >--- a/catalogue/detail.pl >+++ b/catalogue/detail.pl >@@ -21,24 +21,24 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use HTML::Entities; > use Try::Tiny; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Koha; >-use C4::Serials; #uses getsubscriptionfrom biblionumber >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >-use C4::Circulation; >+use C4::Koha qw( GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN getitemtypeimagelocation GetAuthorisedValues ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode GetBiblioData ); >+use C4::Items qw( GetItemsInfo GetHostItemsInfo sub GetAnalyticsCount ); >+use C4::Circulation qw( GetTransfers ); > use C4::Reserves; >-use C4::Serials; >-use C4::XISBN qw(get_xisbns); >+use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); >+use C4::XISBN qw( get_xisbns ); > use C4::External::Amazon; >-use C4::Search; # enabled_staff_search_views >-use C4::Tags qw(get_tags); >+use C4::Search qw( z3950_search_args enabled_staff_search_views ); >+use C4::Tags qw( get_tags get_tag ); > use C4::XSLT; > use Koha::DateUtils; > use C4::HTML5Media; >-use C4::CourseReserves qw(GetItemCourseReservesInfo); >+use C4::CourseReserves qw( GetItemCourseReservesInfo ); > use C4::Acquisition qw(GetOrdersByBiblionumber); > use Koha::AuthorisedValues; > use Koha::Biblios; >diff --git a/catalogue/export.pl b/catalogue/export.pl >index f12cd57c535..ffde69cbcc2 100755 >--- a/catalogue/export.pl >+++ b/catalogue/export.pl >@@ -2,9 +2,9 @@ > use Modern::Perl; > > use C4::Record; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio GetMarcControlnumber ); > use CGI qw ( -utf8 ); > use C4::Ris; > >diff --git a/catalogue/getitem-ajax.pl b/catalogue/getitem-ajax.pl >index 6180874555f..ee8fe56a7bd 100755 >--- a/catalogue/getitem-ajax.pl >+++ b/catalogue/getitem-ajax.pl >@@ -21,11 +21,11 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use JSON; > >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( check_api_auth ); >+use C4::Biblio qw( GetMarcStructure ); > use C4::Items; > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_with_http_headers ); > use Koha::Libraries; > > use Koha::AuthorisedValues; >diff --git a/catalogue/imageviewer.pl b/catalogue/imageviewer.pl >index 9cc96c11d64..5de5ed6b494 100755 >--- a/catalogue/imageviewer.pl >+++ b/catalogue/imageviewer.pl >@@ -20,11 +20,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Items; >-use C4::Output; >-use C4::Search; >+use C4::Items qw( GetItemsInfo ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Search qw( enabled_staff_search_views ); > > use Koha::Biblios; > use Koha::Items; >diff --git a/catalogue/issuehistory.pl b/catalogue/issuehistory.pl >index e81ec56de50..dc05b3ea175 100755 >--- a/catalogue/issuehistory.pl >+++ b/catalogue/issuehistory.pl >@@ -19,12 +19,12 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use C4::Biblio; # GetBiblio >-use C4::Search; # enabled_staff_search_views >-use C4::Serials; >+use C4::Search qw( enabled_staff_search_views ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > use Koha::Checkouts; > use Koha::Old::Checkouts; > >diff --git a/catalogue/item-export.pl b/catalogue/item-export.pl >index fbc69bf71a7..0867376d302 100755 >--- a/catalogue/item-export.pl >+++ b/catalogue/item-export.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > > my $cgi = CGI->new; >diff --git a/catalogue/itemsearch.pl b/catalogue/itemsearch.pl >index f5f66fe349f..54e3817d377 100755 >--- a/catalogue/itemsearch.pl >+++ b/catalogue/itemsearch.pl >@@ -21,11 +21,11 @@ use CGI; > > use JSON; > >-use C4::Auth; >-use C4::Output; >-use C4::Items; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers output_html_with_http_headers ); >+use C4::Items qw( SearchItems ); > use C4::Biblio; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > > use Koha::AuthorisedValues; > use Koha::Biblios; >diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl >index 47ce79024dc..f69fe65718f 100755 >--- a/catalogue/labeledMARCdetail.pl >+++ b/catalogue/labeledMARCdetail.pl >@@ -21,13 +21,13 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use HTML::Entities; > use MARC::Record; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >-use C4::Search; # enabled_staff_search_views >-use C4::Serials; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetFrameworkCode GetMarcBiblio GetMarcStructure GetBiblioData ); >+use C4::Items qw( sub ); >+use C4::Search qw( z3950_search_args enabled_staff_search_views ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > > use Koha::Biblios; > use Koha::BiblioFrameworks; >diff --git a/catalogue/moredetail.pl b/catalogue/moredetail.pl >index 94a7eab12f5..ad548bff864 100755 >--- a/catalogue/moredetail.pl >+++ b/catalogue/moredetail.pl >@@ -20,16 +20,16 @@ > > > use Modern::Perl; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use CGI qw ( -utf8 ); > use HTML::Entities; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetBiblioData GetFrameworkCode GetMarcBiblio ); >+use C4::Items qw( sub GetItemsInfo GetHostItemsInfo ); > use C4::Acquisition; >-use C4::Output; >-use C4::Auth; >-use C4::Serials; >-use C4::Search; # enabled_staff_search_views >+use C4::Output qw( output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); >+use C4::Search qw( enabled_staff_search_views z3950_search_args ); > > use Koha::Acquisition::Booksellers; > use Koha::AuthorisedValues; >diff --git a/catalogue/search-history.pl b/catalogue/search-history.pl >index 092be2e89f5..42bef7cfd46 100755 >--- a/catalogue/search-history.pl >+++ b/catalogue/search-history.pl >@@ -21,9 +21,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Search::History; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > >diff --git a/catalogue/search.pl b/catalogue/search.pl >index 9552c390899..1c8914f2671 100755 >--- a/catalogue/search.pl >+++ b/catalogue/search.pl >@@ -140,14 +140,14 @@ use Modern::Perl; > > ## load Koha modules > use C4::Context; >-use C4::Output; >-use C4::Auth qw(:DEFAULT get_session); >-use C4::Search; >-use C4::Languages qw(getLanguages); >-use C4::Koha; >+use C4::Output qw( output_html_with_http_headers pagination_bar ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Search qw( searchResults enabled_staff_search_views z3950_search_args new_record_from_zebra ); >+use C4::Languages qw( getlanguage getLanguages ); >+use C4::Koha qw( getitemtypeimagelocation GetAuthorisedValues ); > use URI::Escape; > use POSIX qw(ceil floor); >-use C4::Search::History; >+use C4::Search qw( searchResults enabled_staff_search_views z3950_search_args new_record_from_zebra ); > > use Koha::ItemTypes; > use Koha::Library::Groups; >diff --git a/catalogue/showmarc.pl b/catalogue/showmarc.pl >index 0c252c12293..460d5b407f6 100755 >--- a/catalogue/showmarc.pl >+++ b/catalogue/showmarc.pl >@@ -29,10 +29,10 @@ use Encode; > > # Koha modules used > use C4::Context; >-use C4::Output; >-use C4::Auth; >-use C4::Biblio; >-use C4::ImportBatch; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio GetXmlBiblio ); >+use C4::ImportBatch qw( GetRecordFromImportBiblio ); > use C4::XSLT (); > > my $input= CGI->new; >diff --git a/catalogue/stockrotation.pl b/catalogue/stockrotation.pl >index 015b1235dcf..27813c02e83 100755 >--- a/catalogue/stockrotation.pl >+++ b/catalogue/stockrotation.pl >@@ -27,16 +27,16 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >-use C4::Output; >-use C4::Search; >-use C4::Serials; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Search qw( enabled_staff_search_views ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > > use Koha::Biblio; > use Koha::Item; > use Koha::StockRotationRotas; > use Koha::StockRotationStages; >-use Koha::Util::StockRotation qw(:ALL); >+use Koha::Util::StockRotation qw( get_stages get_branches toggle_indemand remove_from_stage move_to_next_stage ); > > my $input = CGI->new; > >diff --git a/catalogue/updateitem.pl b/catalogue/updateitem.pl >index 9ff9f9b2d52..708a42b4614 100755 >--- a/catalogue/updateitem.pl >+++ b/catalogue/updateitem.pl >@@ -19,12 +19,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Context; > use C4::Biblio; > use C4::Items; > use C4::Output; >-use C4::Circulation; >+use C4::Circulation qw( LostItem ); > use C4::Reserves; > > my $cgi= CGI->new; >diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl >index 7eba09f55dd..badaf66d0f2 100755 >--- a/cataloguing/addbiblio.pl >+++ b/cataloguing/addbiblio.pl >@@ -22,18 +22,18 @@ > use Modern::Perl; > > use CGI q(-utf8); >-use C4::Output; >-use C4::Auth; >-use C4::Biblio; >-use C4::Search; >-use C4::AuthoritiesMarc; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user haspermission ); >+use C4::Biblio qw( GetMarcFromKohaField GetFrameworkCode GetMarcStructure GetUsedMarcStructure GetMarcBiblio PrepHostMarcField prepare_host_field TransformHtmlToMarc ModBiblio AddBiblio DelBiblio ); >+use C4::Search qw( FindDuplicate enabled_staff_search_views ); >+use C4::Auth qw( get_template_and_user haspermission ); > use C4::Context; > use MARC::Record; > use C4::Log; > use C4::Koha; >-use C4::ClassSource; >-use C4::ImportBatch; >-use C4::Charset; >+use C4::ClassSource qw( GetClassSources GetClassSource ); >+use C4::ImportBatch qw( sub GetImportRecordMarc ); >+use C4::Charset qw( SetMarcUnicodeFlag ); > use Koha::BiblioFrameworks; > use Koha::DateUtils; > >diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl >index 69a573186ec..1deb5afa237 100755 >--- a/cataloguing/addbooks.pl >+++ b/cataloguing/addbooks.pl >@@ -28,13 +28,13 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use URI::Escape; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Breeding; >-use C4::Output; >-use C4::Koha; >-use C4::Languages qw(getlanguage); >-use C4::Search; >+use C4::Breeding qw( BreedingSearch ); >+use C4::Output qw( output_html_with_http_headers pagination_bar ); >+use C4::Koha qw( getnbpages ); >+use C4::Languages qw( getlanguage ); >+use C4::Search qw( searchResults z3950_search_args ); > > use Koha::BiblioFrameworks; > use Koha::SearchEngine::Search; >diff --git a/cataloguing/additem.pl b/cataloguing/additem.pl >index 870f767e8b6..48b655a4de0 100755 >--- a/cataloguing/additem.pl >+++ b/cataloguing/additem.pl >@@ -22,14 +22,14 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >+use C4::Auth qw( get_template_and_user haspermission ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcFromKohaField GetFrameworkCode GetMarcStructure GetMarcBiblio TransformMarcToKoha TransformHtmlToXml ModBiblio EmbedItemsInMarcBiblio GetAuthorisedValueDesc IsMarcStructureInternal ); >+use C4::Items qw( sub AddItemFromMarc GetMarcItem ModItemFromMarc ); > use C4::Context; >-use C4::Circulation; >-use C4::Koha; >-use C4::ClassSource; >+use C4::Circulation qw( LostItem ); >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::ClassSource qw( GetClassSources GetClassSource ); > use Koha::DateUtils; > use Koha::Items; > use Koha::ItemTypes; >@@ -37,7 +37,7 @@ use Koha::Libraries; > use Koha::Patrons; > use Koha::SearchEngine::Indexer; > use List::MoreUtils qw/any/; >-use C4::Search; >+use C4::Search qw( enabled_staff_search_views ); > use Storable qw(thaw freeze); > use URI::Escape; > use C4::Members; >diff --git a/cataloguing/editor.pl b/cataloguing/editor.pl >index cfef40490a0..5fb2f0c0f70 100755 >--- a/cataloguing/editor.pl >+++ b/cataloguing/editor.pl >@@ -23,10 +23,10 @@ use Modern::Perl; > use CGI; > use MARC::Record; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use DBIx::Class::ResultClass::HashRefInflator; > use Koha::Database; > use Koha::MarcSubfieldStructures; >diff --git a/cataloguing/linkitem.pl b/cataloguing/linkitem.pl >index 72e25e622e0..2bce8b0e700 100755 >--- a/cataloguing/linkitem.pl >+++ b/cataloguing/linkitem.pl >@@ -22,10 +22,10 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcBiblio PrepHostMarcField ModBiblio ); >+use C4::Items qw( sub ); > use C4::Context; > use C4::Koha; > >diff --git a/cataloguing/merge.pl b/cataloguing/merge.pl >index 7b1f81635cf..57c53f13460 100755 >--- a/cataloguing/merge.pl >+++ b/cataloguing/merge.pl >@@ -21,13 +21,13 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Output; >-use C4::Auth; >-use C4::Items; >-use C4::Biblio; >-use C4::Serials; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Items qw( sub MoveItemFromBiblio ); >+use C4::Biblio qw( TransformHtmlToMarc GetMarcBiblio ModBiblio DelBiblio GetFrameworkCode GetMarcStructure GetMarcFromKohaField GetBiblioData ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > use C4::Koha; >-use C4::Reserves qw/MergeHolds/; >+use C4::Reserves qw( MergeHolds ); > use C4::Acquisition qw/ModOrder GetOrdersByBiblionumber/; > > use Koha::BiblioFrameworks; >diff --git a/cataloguing/merge_ajax.pl b/cataloguing/merge_ajax.pl >index aef7dcbfb90..1d1c8b147c7 100755 >--- a/cataloguing/merge_ajax.pl >+++ b/cataloguing/merge_ajax.pl >@@ -7,8 +7,8 @@ use CGI::Cookie; # need to check cookies before CGI parses the POST request > use JSON; > > use C4::Context; >-use C4::Biblio; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Biblio qw( GetMarcStructure ); >+use C4::Auth qw( check_cookie_auth ); > > my %cookies = CGI::Cookie->fetch; > my ( $auth_status, $sessionID ) = check_cookie_auth( >diff --git a/cataloguing/moveitem.pl b/cataloguing/moveitem.pl >index c5e6bca9817..285f09267ec 100755 >--- a/cataloguing/moveitem.pl >+++ b/cataloguing/moveitem.pl >@@ -22,10 +22,10 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; >-use C4::Items; >+use C4::Items qw( MoveItemFromBiblio ); > use C4::Context; > use C4::Koha; > use C4::ClassSource; >diff --git a/cataloguing/value_builder/EXAMPLE.pl b/cataloguing/value_builder/EXAMPLE.pl >index 2e13d6ad862..691e69f8e2b 100755 >--- a/cataloguing/value_builder/EXAMPLE.pl >+++ b/cataloguing/value_builder/EXAMPLE.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > # Example of framework plugin new style. > # It should define and return at least one and normally two anynomous >diff --git a/cataloguing/value_builder/barcode.pl b/cataloguing/value_builder/barcode.pl >index bf5b0739dd2..b03c23f4213 100755 >--- a/cataloguing/value_builder/barcode.pl >+++ b/cataloguing/value_builder/barcode.pl >@@ -24,7 +24,7 @@ use Modern::Perl; > > use C4::Context; > use C4::Barcodes::ValueBuilder; >-use C4::Biblio qw/GetMarcFromKohaField/; >+use C4::Biblio qw( GetMarcFromKohaField ); > use Koha::DateUtils; > > use Algorithm::CheckDigits; >diff --git a/cataloguing/value_builder/barcode_manual.pl b/cataloguing/value_builder/barcode_manual.pl >index 91c5f186a8b..c047fc58d96 100755 >--- a/cataloguing/value_builder/barcode_manual.pl >+++ b/cataloguing/value_builder/barcode_manual.pl >@@ -24,7 +24,7 @@ use Modern::Perl; > > use C4::Context; > use C4::Barcodes::ValueBuilder; >-use C4::Biblio qw/GetMarcFromKohaField/; >+use C4::Biblio qw( GetMarcFromKohaField ); > use Koha::DateUtils; > > my $DEBUG = 0; >diff --git a/cataloguing/value_builder/callnumber-KU.pl b/cataloguing/value_builder/callnumber-KU.pl >index d7a9278203d..6b19299c8c8 100755 >--- a/cataloguing/value_builder/callnumber-KU.pl >+++ b/cataloguing/value_builder/callnumber-KU.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > =head1 DESCRIPTION > >diff --git a/cataloguing/value_builder/callnumber.pl b/cataloguing/value_builder/callnumber.pl >index dd274129b9a..8b7be3c9444 100755 >--- a/cataloguing/value_builder/callnumber.pl >+++ b/cataloguing/value_builder/callnumber.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > =head1 DESCRIPTION > >diff --git a/cataloguing/value_builder/cn_browser.pl b/cataloguing/value_builder/cn_browser.pl >index 2acdcc782a6..ac89109fc1a 100755 >--- a/cataloguing/value_builder/cn_browser.pl >+++ b/cataloguing/value_builder/cn_browser.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >-use C4::ClassSource; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::ClassSource qw( GetClassSort ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::ClassSources; > >diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl >index 071a29e8058..8c766308208 100755 >--- a/cataloguing/value_builder/macles.pl >+++ b/cataloguing/value_builder/macles.pl >@@ -23,8 +23,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > > my $builder = sub { > my ( $params ) = @_; >diff --git a/cataloguing/value_builder/marc21_field_006.pl b/cataloguing/value_builder/marc21_field_006.pl >index 65c8c8032f3..7853f09c2ae 100755 >--- a/cataloguing/value_builder/marc21_field_006.pl >+++ b/cataloguing/value_builder/marc21_field_006.pl >@@ -20,12 +20,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use XML::LibXML; > >diff --git a/cataloguing/value_builder/marc21_field_007.pl b/cataloguing/value_builder/marc21_field_007.pl >index f06dd8b260f..16d69f16153 100755 >--- a/cataloguing/value_builder/marc21_field_007.pl >+++ b/cataloguing/value_builder/marc21_field_007.pl >@@ -21,12 +21,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $builder = sub { > my ( $params ) = @_; >diff --git a/cataloguing/value_builder/marc21_field_008.pl b/cataloguing/value_builder/marc21_field_008.pl >index 0951e10a6a0..46585aa874f 100755 >--- a/cataloguing/value_builder/marc21_field_008.pl >+++ b/cataloguing/value_builder/marc21_field_008.pl >@@ -20,12 +20,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use XML::LibXML; > use Koha::Util::FrameworkPlugin qw|date_entered|; >diff --git a/cataloguing/value_builder/marc21_field_008_authorities.pl b/cataloguing/value_builder/marc21_field_008_authorities.pl >index 1047faca475..a250566c8de 100755 >--- a/cataloguing/value_builder/marc21_field_008_authorities.pl >+++ b/cataloguing/value_builder/marc21_field_008_authorities.pl >@@ -20,12 +20,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Util::FrameworkPlugin qw|date_entered|; > > use constant FIXLEN_DATA_ELTS => '|| aca||aabn | a|a d'; >diff --git a/cataloguing/value_builder/marc21_field_008_classifications.pl b/cataloguing/value_builder/marc21_field_008_classifications.pl >index d864f87459d..c5890963735 100755 >--- a/cataloguing/value_builder/marc21_field_008_classifications.pl >+++ b/cataloguing/value_builder/marc21_field_008_classifications.pl >@@ -16,12 +16,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Util::FrameworkPlugin qw|date_entered|; > > use constant FIXLEN_DATA_ELTS => 'baaaaaaa'; >diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl >index 4a176e0d11b..abefba21c26 100755 >--- a/cataloguing/value_builder/marc21_leader.pl >+++ b/cataloguing/value_builder/marc21_leader.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $builder = sub { > my ( $params ) = @_; >diff --git a/cataloguing/value_builder/marc21_leader_authorities.pl b/cataloguing/value_builder/marc21_leader_authorities.pl >index 03d76eed214..c4250b6983b 100755 >--- a/cataloguing/value_builder/marc21_leader_authorities.pl >+++ b/cataloguing/value_builder/marc21_leader_authorities.pl >@@ -21,12 +21,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $builder = sub { > my ( $params ) = @_; >diff --git a/cataloguing/value_builder/marc21_linking_section.pl b/cataloguing/value_builder/marc21_linking_section.pl >index 905dd102abe..819b5f77662 100755 >--- a/cataloguing/value_builder/marc21_linking_section.pl >+++ b/cataloguing/value_builder/marc21_linking_section.pl >@@ -22,13 +22,13 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Search; >-use C4::Auth; >-use C4::Output; >+use C4::Search qw( new_record_from_zebra ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio TransformMarcToKoha ); > use C4::Koha; > use MARC::Record; > >diff --git a/cataloguing/value_builder/normarc_field_007.pl b/cataloguing/value_builder/normarc_field_007.pl >index 89051a23566..536ee4268f0 100755 >--- a/cataloguing/value_builder/normarc_field_007.pl >+++ b/cataloguing/value_builder/normarc_field_007.pl >@@ -18,12 +18,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/normarc_field_008.pl b/cataloguing/value_builder/normarc_field_008.pl >index 0f0bfb9a1ae..7847f5602f3 100755 >--- a/cataloguing/value_builder/normarc_field_008.pl >+++ b/cataloguing/value_builder/normarc_field_008.pl >@@ -18,12 +18,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > # find today's date > my ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $isdst) = localtime(time); >diff --git a/cataloguing/value_builder/normarc_leader.pl b/cataloguing/value_builder/normarc_leader.pl >index 7a07aac2845..8dfb7413fd4 100755 >--- a/cataloguing/value_builder/normarc_leader.pl >+++ b/cataloguing/value_builder/normarc_leader.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/stocknumberAV.pl b/cataloguing/value_builder/stocknumberAV.pl >index 0f75449677b..810ab695dba 100755 >--- a/cataloguing/value_builder/stocknumberAV.pl >+++ b/cataloguing/value_builder/stocknumberAV.pl >@@ -22,8 +22,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::AuthorisedValues; > > =head1 DESCRIPTION >diff --git a/cataloguing/value_builder/stocknumberam123.pl b/cataloguing/value_builder/stocknumberam123.pl >index a69506eaf1d..8471097295d 100755 >--- a/cataloguing/value_builder/stocknumberam123.pl >+++ b/cataloguing/value_builder/stocknumberam123.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > =head1 DESCRIPTION > >diff --git a/cataloguing/value_builder/unimarc_field_010.pl b/cataloguing/value_builder/unimarc_field_010.pl >index 4994dc34184..5ca21376a31 100755 >--- a/cataloguing/value_builder/unimarc_field_010.pl >+++ b/cataloguing/value_builder/unimarc_field_010.pl >@@ -19,10 +19,10 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > > sub plugin_javascript { >diff --git a/cataloguing/value_builder/unimarc_field_100.pl b/cataloguing/value_builder/unimarc_field_100.pl >index 1fe873924aa..0e8804a8c75 100755 >--- a/cataloguing/value_builder/unimarc_field_100.pl >+++ b/cataloguing/value_builder/unimarc_field_100.pl >@@ -23,10 +23,10 @@ use Modern::Perl; > use Date::Calc qw( Today ); > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > > sub plugin_javascript { >diff --git a/cataloguing/value_builder/unimarc_field_100_authorities.pl b/cataloguing/value_builder/unimarc_field_100_authorities.pl >index 13563548aa6..2d2538ac644 100755 >--- a/cataloguing/value_builder/unimarc_field_100_authorities.pl >+++ b/cataloguing/value_builder/unimarc_field_100_authorities.pl >@@ -20,10 +20,10 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > > sub plugin_javascript { >diff --git a/cataloguing/value_builder/unimarc_field_105.pl b/cataloguing/value_builder/unimarc_field_105.pl >index 75b26d26a27..effa8f9e2ea 100755 >--- a/cataloguing/value_builder/unimarc_field_105.pl >+++ b/cataloguing/value_builder/unimarc_field_105.pl >@@ -22,12 +22,12 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_106.pl b/cataloguing/value_builder/unimarc_field_106.pl >index f11a021a478..a0d6d6fa521 100755 >--- a/cataloguing/value_builder/unimarc_field_106.pl >+++ b/cataloguing/value_builder/unimarc_field_106.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_110.pl b/cataloguing/value_builder/unimarc_field_110.pl >index 68fad1379f2..65b398e6914 100755 >--- a/cataloguing/value_builder/unimarc_field_110.pl >+++ b/cataloguing/value_builder/unimarc_field_110.pl >@@ -22,12 +22,12 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_115a.pl b/cataloguing/value_builder/unimarc_field_115a.pl >index 746597f1f2e..cf70688986b 100755 >--- a/cataloguing/value_builder/unimarc_field_115a.pl >+++ b/cataloguing/value_builder/unimarc_field_115a.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_115b.pl b/cataloguing/value_builder/unimarc_field_115b.pl >index e4d3379e4d2..a2b71bb2540 100755 >--- a/cataloguing/value_builder/unimarc_field_115b.pl >+++ b/cataloguing/value_builder/unimarc_field_115b.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_116.pl b/cataloguing/value_builder/unimarc_field_116.pl >index ef083f6aacb..65598617caf 100755 >--- a/cataloguing/value_builder/unimarc_field_116.pl >+++ b/cataloguing/value_builder/unimarc_field_116.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_117.pl b/cataloguing/value_builder/unimarc_field_117.pl >index dcbeddfb317..9c2bf97f773 100755 >--- a/cataloguing/value_builder/unimarc_field_117.pl >+++ b/cataloguing/value_builder/unimarc_field_117.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_120.pl b/cataloguing/value_builder/unimarc_field_120.pl >index 6ee6d0aa195..75f3c735cda 100755 >--- a/cataloguing/value_builder/unimarc_field_120.pl >+++ b/cataloguing/value_builder/unimarc_field_120.pl >@@ -22,12 +22,12 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_121a.pl b/cataloguing/value_builder/unimarc_field_121a.pl >index 1ef29eb2cac..c8919cd302c 100755 >--- a/cataloguing/value_builder/unimarc_field_121a.pl >+++ b/cataloguing/value_builder/unimarc_field_121a.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_121b.pl b/cataloguing/value_builder/unimarc_field_121b.pl >index acf8dd143ba..5054d35eac4 100755 >--- a/cataloguing/value_builder/unimarc_field_121b.pl >+++ b/cataloguing/value_builder/unimarc_field_121b.pl >@@ -19,12 +19,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_122.pl b/cataloguing/value_builder/unimarc_field_122.pl >index 133411f7ae7..4e9948128a6 100755 >--- a/cataloguing/value_builder/unimarc_field_122.pl >+++ b/cataloguing/value_builder/unimarc_field_122.pl >@@ -19,12 +19,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123a.pl b/cataloguing/value_builder/unimarc_field_123a.pl >index 1b4d82ae70c..b6b59b87152 100755 >--- a/cataloguing/value_builder/unimarc_field_123a.pl >+++ b/cataloguing/value_builder/unimarc_field_123a.pl >@@ -19,12 +19,12 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123d.pl b/cataloguing/value_builder/unimarc_field_123d.pl >index 2a23edcadfc..32e7842f815 100755 >--- a/cataloguing/value_builder/unimarc_field_123d.pl >+++ b/cataloguing/value_builder/unimarc_field_123d.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123e.pl b/cataloguing/value_builder/unimarc_field_123e.pl >index 2a23edcadfc..32e7842f815 100755 >--- a/cataloguing/value_builder/unimarc_field_123e.pl >+++ b/cataloguing/value_builder/unimarc_field_123e.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123f.pl b/cataloguing/value_builder/unimarc_field_123f.pl >index 9446d977d1e..5b3cde25a2c 100755 >--- a/cataloguing/value_builder/unimarc_field_123f.pl >+++ b/cataloguing/value_builder/unimarc_field_123f.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123g.pl b/cataloguing/value_builder/unimarc_field_123g.pl >index 2a23edcadfc..32e7842f815 100755 >--- a/cataloguing/value_builder/unimarc_field_123g.pl >+++ b/cataloguing/value_builder/unimarc_field_123g.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123i.pl b/cataloguing/value_builder/unimarc_field_123i.pl >index 5e1203bbf15..8550a34f782 100755 >--- a/cataloguing/value_builder/unimarc_field_123i.pl >+++ b/cataloguing/value_builder/unimarc_field_123i.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_123j.pl b/cataloguing/value_builder/unimarc_field_123j.pl >index cdbdcf21502..5edd3667393 100755 >--- a/cataloguing/value_builder/unimarc_field_123j.pl >+++ b/cataloguing/value_builder/unimarc_field_123j.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124.pl b/cataloguing/value_builder/unimarc_field_124.pl >index f5bfe46af22..fd594f77727 100755 >--- a/cataloguing/value_builder/unimarc_field_124.pl >+++ b/cataloguing/value_builder/unimarc_field_124.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124a.pl b/cataloguing/value_builder/unimarc_field_124a.pl >index 43885a7f3ac..100a20e6fbb 100755 >--- a/cataloguing/value_builder/unimarc_field_124a.pl >+++ b/cataloguing/value_builder/unimarc_field_124a.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124b.pl b/cataloguing/value_builder/unimarc_field_124b.pl >index 8512632dcd7..6b1c9a3edc7 100755 >--- a/cataloguing/value_builder/unimarc_field_124b.pl >+++ b/cataloguing/value_builder/unimarc_field_124b.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124c.pl b/cataloguing/value_builder/unimarc_field_124c.pl >index f56f64c8b52..e899c2b6b0d 100755 >--- a/cataloguing/value_builder/unimarc_field_124c.pl >+++ b/cataloguing/value_builder/unimarc_field_124c.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124d.pl b/cataloguing/value_builder/unimarc_field_124d.pl >index 5f60644c18b..0c00845bdfa 100755 >--- a/cataloguing/value_builder/unimarc_field_124d.pl >+++ b/cataloguing/value_builder/unimarc_field_124d.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124e.pl b/cataloguing/value_builder/unimarc_field_124e.pl >index 51f7b68ca75..5088d344c9b 100755 >--- a/cataloguing/value_builder/unimarc_field_124e.pl >+++ b/cataloguing/value_builder/unimarc_field_124e.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124f.pl b/cataloguing/value_builder/unimarc_field_124f.pl >index ff768c13a1b..12b71d74040 100755 >--- a/cataloguing/value_builder/unimarc_field_124f.pl >+++ b/cataloguing/value_builder/unimarc_field_124f.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_124g.pl b/cataloguing/value_builder/unimarc_field_124g.pl >index 68fcfd0f780..b67db111062 100755 >--- a/cataloguing/value_builder/unimarc_field_124g.pl >+++ b/cataloguing/value_builder/unimarc_field_124g.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_125.pl b/cataloguing/value_builder/unimarc_field_125.pl >index 400a290f241..04cb912b178 100755 >--- a/cataloguing/value_builder/unimarc_field_125.pl >+++ b/cataloguing/value_builder/unimarc_field_125.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > =head1 DESCRIPTION > >diff --git a/cataloguing/value_builder/unimarc_field_125a.pl b/cataloguing/value_builder/unimarc_field_125a.pl >index 67ae25df5ac..f0f8da6173f 100755 >--- a/cataloguing/value_builder/unimarc_field_125a.pl >+++ b/cataloguing/value_builder/unimarc_field_125a.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_125b.pl b/cataloguing/value_builder/unimarc_field_125b.pl >index b8e36d9cc1f..6bfb3bb0e20 100755 >--- a/cataloguing/value_builder/unimarc_field_125b.pl >+++ b/cataloguing/value_builder/unimarc_field_125b.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_126.pl b/cataloguing/value_builder/unimarc_field_126.pl >index f5bfe46af22..fd594f77727 100755 >--- a/cataloguing/value_builder/unimarc_field_126.pl >+++ b/cataloguing/value_builder/unimarc_field_126.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_126a.pl b/cataloguing/value_builder/unimarc_field_126a.pl >index b0e737d9100..679a2e07dc5 100755 >--- a/cataloguing/value_builder/unimarc_field_126a.pl >+++ b/cataloguing/value_builder/unimarc_field_126a.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_126b.pl b/cataloguing/value_builder/unimarc_field_126b.pl >index d9704624dee..5cad30da56a 100755 >--- a/cataloguing/value_builder/unimarc_field_126b.pl >+++ b/cataloguing/value_builder/unimarc_field_126b.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_127.pl b/cataloguing/value_builder/unimarc_field_127.pl >index 53d740182f5..29ed3e16ba5 100755 >--- a/cataloguing/value_builder/unimarc_field_127.pl >+++ b/cataloguing/value_builder/unimarc_field_127.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_128a.pl b/cataloguing/value_builder/unimarc_field_128a.pl >index 85ab6605056..7a2ed4db3fa 100755 >--- a/cataloguing/value_builder/unimarc_field_128a.pl >+++ b/cataloguing/value_builder/unimarc_field_128a.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_128b.pl b/cataloguing/value_builder/unimarc_field_128b.pl >index e32367f7833..1ff06e11784 100755 >--- a/cataloguing/value_builder/unimarc_field_128b.pl >+++ b/cataloguing/value_builder/unimarc_field_128b.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_128c.pl b/cataloguing/value_builder/unimarc_field_128c.pl >index 7be92ed030f..094f5a63f64 100755 >--- a/cataloguing/value_builder/unimarc_field_128c.pl >+++ b/cataloguing/value_builder/unimarc_field_128c.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_130.pl b/cataloguing/value_builder/unimarc_field_130.pl >index 04d0fb95907..2adc1cb304c 100755 >--- a/cataloguing/value_builder/unimarc_field_130.pl >+++ b/cataloguing/value_builder/unimarc_field_130.pl >@@ -22,12 +22,12 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_135a.pl b/cataloguing/value_builder/unimarc_field_135a.pl >index 7a41b59ae8d..4215ce8f47a 100755 >--- a/cataloguing/value_builder/unimarc_field_135a.pl >+++ b/cataloguing/value_builder/unimarc_field_135a.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_140.pl b/cataloguing/value_builder/unimarc_field_140.pl >index 980dc0914e4..5c046f11a32 100755 >--- a/cataloguing/value_builder/unimarc_field_140.pl >+++ b/cataloguing/value_builder/unimarc_field_140.pl >@@ -22,12 +22,12 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_141.pl b/cataloguing/value_builder/unimarc_field_141.pl >index c8f36ceb40f..9139ed12c9c 100755 >--- a/cataloguing/value_builder/unimarc_field_141.pl >+++ b/cataloguing/value_builder/unimarc_field_141.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl >index 9bf82f72b98..fc976198353 100755 >--- a/cataloguing/value_builder/unimarc_field_210c.pl >+++ b/cataloguing/value_builder/unimarc_field_210c.pl >@@ -19,14 +19,14 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::AuthoritiesMarc; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( pagination_bar output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Search; > use MARC::Record; >-use C4::Koha; >+use C4::Koha qw( getnbpages ); > > ###TODO To rewrite in order to use SearchAuthorities > >diff --git a/cataloguing/value_builder/unimarc_field_210c_bis.pl b/cataloguing/value_builder/unimarc_field_210c_bis.pl >index 89ab95b93a0..0d4975287a7 100755 >--- a/cataloguing/value_builder/unimarc_field_210c_bis.pl >+++ b/cataloguing/value_builder/unimarc_field_210c_bis.pl >@@ -40,12 +40,12 @@ It need : > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > >-use C4::AuthoritiesMarc; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_225a.pl b/cataloguing/value_builder/unimarc_field_225a.pl >index a8b39930d43..7419e682b2e 100755 >--- a/cataloguing/value_builder/unimarc_field_225a.pl >+++ b/cataloguing/value_builder/unimarc_field_225a.pl >@@ -41,12 +41,12 @@ It need : > > use strict; > #use warnings; FIXME - Bug 2505 >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > >-use C4::AuthoritiesMarc; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > =head1 DESCRIPTION > >diff --git a/cataloguing/value_builder/unimarc_field_225a_bis.pl b/cataloguing/value_builder/unimarc_field_225a_bis.pl >index 98af5b50c32..339a33044a5 100755 >--- a/cataloguing/value_builder/unimarc_field_225a_bis.pl >+++ b/cataloguing/value_builder/unimarc_field_225a_bis.pl >@@ -24,11 +24,11 @@ biblioitems.collectiontitle > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw( -utf8 ); > use C4::Context; > >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_4XX.pl b/cataloguing/value_builder/unimarc_field_4XX.pl >index 0caebe1bd85..340b68d417c 100755 >--- a/cataloguing/value_builder/unimarc_field_4XX.pl >+++ b/cataloguing/value_builder/unimarc_field_4XX.pl >@@ -22,13 +22,13 @@ use strict; > #use warnings; FIXME - Bug 2505 > > use CGI qw ( -utf8 ); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Search; >-use C4::Auth; >-use C4::Output; >+use C4::Search qw( new_record_from_zebra ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio TransformMarcToKoha ); > use C4::Koha; > use MARC::Record; > >diff --git a/cataloguing/value_builder/unimarc_field_686a.pl b/cataloguing/value_builder/unimarc_field_686a.pl >index eefdccf1719..56ee99e25d2 100755 >--- a/cataloguing/value_builder/unimarc_field_686a.pl >+++ b/cataloguing/value_builder/unimarc_field_686a.pl >@@ -19,12 +19,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_field_700-4.pl b/cataloguing/value_builder/unimarc_field_700-4.pl >index ea385154757..501f80ac2d2 100755 >--- a/cataloguing/value_builder/unimarc_field_700-4.pl >+++ b/cataloguing/value_builder/unimarc_field_700-4.pl >@@ -21,12 +21,12 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_; >diff --git a/cataloguing/value_builder/unimarc_leader.pl b/cataloguing/value_builder/unimarc_leader.pl >index 222bf84d01d..8147db46df7 100755 >--- a/cataloguing/value_builder/unimarc_leader.pl >+++ b/cataloguing/value_builder/unimarc_leader.pl >@@ -21,12 +21,12 @@ > use Modern::Perl; > > use Koha::Util::FrameworkPlugin qw(wrapper); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; > > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > sub plugin_javascript { > my ( $dbh, $record, $tagslib, $field_number, $tabloop ) = @_; >diff --git a/cataloguing/ysearch.pl b/cataloguing/ysearch.pl >index 1683da4835a..3a2f2f32572 100755 >--- a/cataloguing/ysearch.pl >+++ b/cataloguing/ysearch.pl >@@ -27,8 +27,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Charset; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Charset qw( nsb_clean ); >+use C4::Auth qw( check_cookie_auth ); > use JSON qw/ to_json /; > > my $input = CGI->new; >diff --git a/cataloguing/z3950_auth_search.pl b/cataloguing/z3950_auth_search.pl >index e97c47d91fb..8295170caed 100755 >--- a/cataloguing/z3950_auth_search.pl >+++ b/cataloguing/z3950_auth_search.pl >@@ -20,10 +20,10 @@ use Modern::Perl; > > use CGI qw / -utf8 /; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Breeding; >+use C4::Breeding qw( Z3950Search Z3950SearchAuth ); > use C4::Koha; > > my $input = CGI->new; >diff --git a/cataloguing/z3950_search.pl b/cataloguing/z3950_search.pl >index f5f04246d6d..fe3b596146e 100755 >--- a/cataloguing/z3950_search.pl >+++ b/cataloguing/z3950_search.pl >@@ -21,10 +21,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Breeding; >+use C4::Breeding qw( Z3950Search ); > use C4::Koha; > > my $input = CGI->new; >diff --git a/circ/add_message.pl b/circ/add_message.pl >index 455791b919b..c62332527bb 100755 >--- a/circ/add_message.pl >+++ b/circ/add_message.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use Koha::Patron::Message; > >diff --git a/circ/article-request-slip.pl b/circ/article-request-slip.pl >index 2175561edba..e46161ab92b 100755 >--- a/circ/article-request-slip.pl >+++ b/circ/article-request-slip.pl >@@ -22,9 +22,9 @@ use Modern::Perl; > use CGI qw( -utf8 ); > > use C4::Context; >-use C4::Output; >-use C4::Auth; >-use C4::Letters; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Letters qw( GetPreparedLetter ); > use Koha::ArticleRequests; > use Koha::Patrons; > >diff --git a/circ/article-requests.pl b/circ/article-requests.pl >index 3e856bcafa1..3e918dd4c6e 100755 >--- a/circ/article-requests.pl >+++ b/circ/article-requests.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::ArticleRequests; > > my $query = CGI->new; >diff --git a/circ/bookcount.pl b/circ/bookcount.pl >index 8509991ac43..1284a403656 100755 >--- a/circ/bookcount.pl >+++ b/circ/bookcount.pl >@@ -25,9 +25,9 @@ use CGI qw ( -utf8 ); > use C4::Debug; > use C4::Context; > use C4::Circulation; >-use C4::Output; >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Koha; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use Koha::Biblios; > use Koha::DateUtils; > use Koha::Libraries; >diff --git a/circ/branchoverdues.pl b/circ/branchoverdues.pl >index c36aa3d451d..fce85a7164d 100755 >--- a/circ/branchoverdues.pl >+++ b/circ/branchoverdues.pl >@@ -19,11 +19,11 @@ > use Modern::Perl; > use C4::Context; > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >-use C4::Overdues; >-use C4::Biblio; >-use C4::Koha; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Overdues qw( GetOverduesForBranch ); >+use C4::Biblio qw( GetMarcFromKohaField GetMarcStructure ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Debug; > use Koha::DateUtils; > use Koha::BiblioFrameworks; >diff --git a/circ/branchtransfers.pl b/circ/branchtransfers.pl >index 95ec7899265..7b802288b0d 100755 >--- a/circ/branchtransfers.pl >+++ b/circ/branchtransfers.pl >@@ -22,12 +22,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Circulation; >-use C4::Output; >-use C4::Reserves; >+use C4::Circulation qw( transferbook ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reserves qw( ModReserve ModReserveAffect ); > use C4::Biblio; > use C4::Items; >-use C4::Auth qw/:DEFAULT get_session/; >+use C4::Auth qw( get_session get_template_and_user ); > use C4::Koha; > use C4::Members; > use Koha::BiblioFrameworks; >diff --git a/circ/checkout-notes.pl b/circ/checkout-notes.pl >index 61ce7cc3531..e94bea06c9f 100755 >--- a/circ/checkout-notes.pl >+++ b/circ/checkout-notes.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use Koha::Checkouts; > > my $query = CGI->new; >diff --git a/circ/circulation-home.pl b/circ/circulation-home.pl >index f68535d1f19..239051d8503 100755 >--- a/circ/circulation-home.pl >+++ b/circ/circulation-home.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use Koha::BiblioFrameworks; > use Koha::Checkouts; >diff --git a/circ/circulation.pl b/circ/circulation.pl >index f6dd318f971..8212aeecfed 100755 >--- a/circ/circulation.pl >+++ b/circ/circulation.pl >@@ -29,14 +29,14 @@ use CGI qw ( -utf8 ); > use DateTime; > use DateTime::Duration; > use Scalar::Util qw( looks_like_number ); >-use C4::Output; >-use C4::Auth qw/:DEFAULT get_session haspermission/; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_session get_template_and_user haspermission ); > use C4::Koha; >-use C4::Circulation; >+use C4::Circulation qw( barcodedecode CanBookBeIssued AddIssue ); > use C4::Utils::DataTables::Members; > use C4::Members; >-use C4::Biblio; >-use C4::Search; >+use C4::Biblio qw( TransformMarcToKoha ); >+use C4::Search qw( new_record_from_zebra ); > use MARC::Record; > use C4::Reserves; > use Koha::Holds; >diff --git a/circ/del_message.pl b/circ/del_message.pl >index 496ab655670..b6216458d74 100755 >--- a/circ/del_message.pl >+++ b/circ/del_message.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use Koha::Patron::Messages; > >diff --git a/circ/hold-transfer-slip.pl b/circ/hold-transfer-slip.pl >index c0a3b6ea4cc..1c4ae4b6e8c 100755 >--- a/circ/hold-transfer-slip.pl >+++ b/circ/hold-transfer-slip.pl >@@ -20,10 +20,10 @@ > > use Modern::Perl; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Reserves; >+use C4::Auth qw( get_session get_template_and_user ); >+use C4::Reserves qw( ReserveSlip ); > > use vars qw($debug); > >diff --git a/circ/offline-mf.pl b/circ/offline-mf.pl >index 01b1d7c1866..19eb644f9e9 100755 >--- a/circ/offline-mf.pl >+++ b/circ/offline-mf.pl >@@ -18,7 +18,7 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > > my $query = CGI->new; > my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( >diff --git a/circ/offline.pl b/circ/offline.pl >index d1500d62009..3843cb7243c 100755 >--- a/circ/offline.pl >+++ b/circ/offline.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > my $query = CGI->new; >diff --git a/circ/on-site_checkouts.pl b/circ/on-site_checkouts.pl >index c581e8ef9a7..493e99a449f 100755 >--- a/circ/on-site_checkouts.pl >+++ b/circ/on-site_checkouts.pl >@@ -18,9 +18,9 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Circulation qw( GetPendingOnSiteCheckouts ); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use Koha::BiblioFrameworks; > >diff --git a/circ/overdue.pl b/circ/overdue.pl >index 1ce791fe24d..59f48a3dde7 100755 >--- a/circ/overdue.pl >+++ b/circ/overdue.pl >@@ -21,9 +21,9 @@ > > use Modern::Perl; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw(-oldstyle_urls -utf8); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use Text::CSV_XS; > use Koha::DateUtils; >diff --git a/circ/pendingreserves.pl b/circ/pendingreserves.pl >index 995d63bd9c0..64d2eb45f59 100755 >--- a/circ/pendingreserves.pl >+++ b/circ/pendingreserves.pl >@@ -25,9 +25,9 @@ use YAML::XS; > use Encode; > > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use C4::Items qw( ModItemTransfer ); > use C4::Reserves qw( ModReserveCancelAll ); >diff --git a/circ/renew.pl b/circ/renew.pl >index acce7770af6..98fd20d3a53 100755 >--- a/circ/renew.pl >+++ b/circ/renew.pl >@@ -21,9 +21,9 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >-use C4::Circulation; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Circulation qw( barcodedecode CanBookBeRenewed GetSoonestRenewDate GetLatestAutoRenewDate AddRenewal ); > use C4::Koha; > use Koha::DateUtils; > use Koha::Database; >diff --git a/circ/request-article.pl b/circ/request-article.pl >index 48b1d02e560..16b3c5d5456 100755 >--- a/circ/request-article.pl >+++ b/circ/request-article.pl >@@ -19,11 +19,11 @@ > > use Modern::Perl; > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Utils::DataTables::Members; >-use C4::Search; >-use C4::Serials; >+use C4::Search qw( enabled_staff_search_views ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > use Koha::Biblios; > use Koha::Patrons; > use Koha::ArticleRequests; >diff --git a/circ/reserveratios.pl b/circ/reserveratios.pl >index ed57613d5af..56005da9982 100755 >--- a/circ/reserveratios.pl >+++ b/circ/reserveratios.pl >@@ -25,8 +25,8 @@ use Date::Calc qw/Today Add_Delta_YM/; > use POSIX qw( ceil ); > > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use C4::Acquisition qw/GetOrdersByBiblionumber/; > use Koha::DateUtils; >diff --git a/circ/returns.pl b/circ/returns.pl >index 94e4b5e287a..4032b8aa26f 100755 >--- a/circ/returns.pl >+++ b/circ/returns.pl >@@ -34,19 +34,19 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use DateTime; > >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >-use C4::Circulation; >-use C4::Reserves; >+use C4::Auth qw( get_template_and_user get_session haspermission ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Circulation qw( barcodedecode updateWrongTransfer GetBranchItemRule AddReturn LostItem ); >+use C4::Reserves qw( ModReserve ModReserveAffect GetOtherReserves ); > use C4::Biblio; >-use C4::Circulation; >+use C4::Circulation qw( barcodedecode updateWrongTransfer GetBranchItemRule AddReturn LostItem ); > use C4::Context; >-use C4::Items; >+use C4::Items qw( ModItemTransfer sub ); > use C4::Koha; # FIXME : is it still useful ? > use C4::Members::Messaging; > use C4::Members; >-use C4::Output; >-use C4::Reserves; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reserves qw( ModReserve ModReserveAffect GetOtherReserves ); > use C4::RotatingCollections; > use Koha::AuthorisedValues; > use Koha::BiblioFrameworks; >diff --git a/circ/set-library.pl b/circ/set-library.pl >index b460b15466c..73faf7aeb0e 100755 >--- a/circ/set-library.pl >+++ b/circ/set-library.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use C4::Context; >-use C4::Output; >-use C4::Auth qw/:DEFAULT get_session/; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user get_session ); > use C4::Koha; > use Koha::BiblioFrameworks; > use Koha::Cash::Registers; >diff --git a/circ/transfer-slip.pl b/circ/transfer-slip.pl >index 1cbc98e0922..d25d6dc17c9 100755 >--- a/circ/transfer-slip.pl >+++ b/circ/transfer-slip.pl >@@ -21,10 +21,10 @@ > use Modern::Perl; > > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Circulation; >+use C4::Auth qw( get_session get_template_and_user ); >+use C4::Circulation qw( TransferSlip ); > > use vars qw($debug); > >diff --git a/circ/transfers_to_send.pl b/circ/transfers_to_send.pl >index a12b5103d4e..5e9fe3f6d69 100755 >--- a/circ/transfers_to_send.pl >+++ b/circ/transfers_to_send.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::DateUtils; > >diff --git a/circ/transferstoreceive.pl b/circ/transferstoreceive.pl >index bbf25368ae3..48355a53433 100755 >--- a/circ/transferstoreceive.pl >+++ b/circ/transferstoreceive.pl >@@ -21,10 +21,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Circulation; >+use C4::Circulation qw( GetTransfers GetTransfersFromTo ); > use C4::Members; > use Date::Calc qw( > Today >diff --git a/circ/view_holdsqueue.pl b/circ/view_holdsqueue.pl >index 4e6384e3176..ce42af7f6c3 100755 >--- a/circ/view_holdsqueue.pl >+++ b/circ/view_holdsqueue.pl >@@ -24,11 +24,11 @@ This script displays items in the tmp_holdsqueue table > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; > use C4::Items; >-use C4::HoldsQueue qw(GetHoldsQueueItems); >+use C4::HoldsQueue qw( GetHoldsQueueItems ); > use Koha::BiblioFrameworks; > use Koha::ItemTypes; > >diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl >index 1a8d74ade46..aab2e36910f 100755 >--- a/circ/waitingreserves.pl >+++ b/circ/waitingreserves.pl >@@ -21,18 +21,18 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Circulation; > use C4::Members; > use C4::Biblio; >-use C4::Items; >+use C4::Items qw( sub ModItemTransfer ); > use Date::Calc qw( > Today > Add_Delta_Days > Date_to_Days > ); >-use C4::Reserves; >+use C4::Reserves qw( ModReserve ModReserveCancelAll ); > use C4::Koha; > use Koha::DateUtils; > use Koha::BiblioFrameworks; >diff --git a/circ/ysearch.pl b/circ/ysearch.pl >index a52568640ec..939188d7298 100755 >--- a/circ/ysearch.pl >+++ b/circ/ysearch.pl >@@ -27,7 +27,7 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Auth qw( check_cookie_auth ); > use Koha::Patrons; > use Koha::DateUtils qw/format_sqldatetime/; > >diff --git a/clubs/club-enrollments.pl b/clubs/club-enrollments.pl >index 6163c70894a..3eac228bb7a 100755 >--- a/clubs/club-enrollments.pl >+++ b/clubs/club-enrollments.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Clubs; > > my $cgi = CGI->new; >diff --git a/clubs/clubs-add-modify.pl b/clubs/clubs-add-modify.pl >index 058d8222ba5..264440166eb 100755 >--- a/clubs/clubs-add-modify.pl >+++ b/clubs/clubs-add-modify.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Database; > use Koha::DateUtils qw(dt_from_string); > use Koha::Clubs; >diff --git a/clubs/clubs.pl b/clubs/clubs.pl >index d2d5a963727..bb4dee6dccd 100755 >--- a/clubs/clubs.pl >+++ b/clubs/clubs.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Clubs; > use Koha::Club::Templates; >diff --git a/clubs/patron-clubs-tab.pl b/clubs/patron-clubs-tab.pl >index 1fc47b4dcbd..1a12083e655 100755 >--- a/clubs/patron-clubs-tab.pl >+++ b/clubs/patron-clubs-tab.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Patrons; > use Koha::Club::Enrollments; >diff --git a/clubs/patron-enroll.pl b/clubs/patron-enroll.pl >index 3642996b5cb..367b3c0f4b7 100755 >--- a/clubs/patron-enroll.pl >+++ b/clubs/patron-enroll.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Clubs; > > my $cgi = CGI->new; >diff --git a/clubs/templates-add-modify.pl b/clubs/templates-add-modify.pl >index 7e22af14ce2..5c966584ec2 100755 >--- a/clubs/templates-add-modify.pl >+++ b/clubs/templates-add-modify.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::DateUtils qw(dt_from_string); > use Koha::Club::Templates; >diff --git a/course_reserves/add_items.pl b/course_reserves/add_items.pl >index 7c16a143f59..a8de2068fd1 100755 >--- a/course_reserves/add_items.pl >+++ b/course_reserves/add_items.pl >@@ -22,13 +22,13 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >-use C4::Koha; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Biblio; > use Koha::Items; > >-use C4::CourseReserves qw(GetCourse GetCourseItem GetCourseReserve ModCourseItem ModCourseReserve); >+use C4::CourseReserves qw( GetCourse GetCourseReserve ModCourse ModCourseItem ModCourseReserve ); > > use Koha::Items; > use Koha::ItemTypes; >diff --git a/course_reserves/batch_add_items.pl b/course_reserves/batch_add_items.pl >index 829709930d6..720f5914711 100755 >--- a/course_reserves/batch_add_items.pl >+++ b/course_reserves/batch_add_items.pl >@@ -23,9 +23,9 @@ use Modern::Perl; > use CGI qw( -utf8 ); > use List::MoreUtils qw( uniq ); > >-use C4::Auth; >-use C4::Output; >-use C4::CourseReserves qw(ModCourseItem ModCourseReserve GetCourse); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::CourseReserves qw( GetCourse ModCourse ModCourseItem ModCourseReserve ); > > use Koha::Items; > >diff --git a/course_reserves/batch_rm_items.pl b/course_reserves/batch_rm_items.pl >index bd78bc41c91..de0a49d3b05 100755 >--- a/course_reserves/batch_rm_items.pl >+++ b/course_reserves/batch_rm_items.pl >@@ -22,9 +22,9 @@ use Modern::Perl; > use CGI qw( -utf8 ); > use List::MoreUtils qw( uniq ); > >-use C4::Auth; >-use C4::Output; >-use C4::CourseReserves qw(GetItemCourseReservesInfo DelCourseReserve GetCourseItem); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::CourseReserves qw( GetCourse GetCourseItem GetItemCourseReservesInfo DelCourse DelCourseReserve ); > > use Koha::Items; > >diff --git a/course_reserves/course-details.pl b/course_reserves/course-details.pl >index 35b2bc76959..ac1036daa21 100755 >--- a/course_reserves/course-details.pl >+++ b/course_reserves/course-details.pl >@@ -22,11 +22,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > >-use C4::CourseReserves qw(DelCourseReserve GetCourse GetCourseReserves); >+use C4::CourseReserves qw( DelCourse DelCourseReserve GetCourse GetCourseReserve GetCourseReserves ); > > my $cgi = CGI->new; > >diff --git a/course_reserves/course-reserves.pl b/course_reserves/course-reserves.pl >index 1ecda7ad9e1..6dafac9e99c 100755 >--- a/course_reserves/course-reserves.pl >+++ b/course_reserves/course-reserves.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > >-use C4::CourseReserves qw(GetCourses); >+use C4::CourseReserves qw( GetCourse GetCourses ); > > my $cgi = CGI->new; > >diff --git a/course_reserves/course.pl b/course_reserves/course.pl >index c5fb37baa34..8d66bdcbd5d 100755 >--- a/course_reserves/course.pl >+++ b/course_reserves/course.pl >@@ -22,11 +22,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >-use C4::Koha; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( GetAuthorisedValues ); > >-use C4::CourseReserves qw(GetCourse); >+use C4::CourseReserves qw( GetCourse ); > > my $cgi = CGI->new; > >diff --git a/course_reserves/mod_course.pl b/course_reserves/mod_course.pl >index 060b2a129fc..3abcb9731fa 100755 >--- a/course_reserves/mod_course.pl >+++ b/course_reserves/mod_course.pl >@@ -23,9 +23,9 @@ use CGI qw ( -utf8 ); > > use C4::Output; > use C4::Reserves; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > >-use C4::CourseReserves qw(DelCourse ModCourse ModCourseInstructors); >+use C4::CourseReserves qw( DelCourse ModCourse ModCourseInstructors ); > > my $cgi = CGI->new; > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >diff --git a/errors/400.pl b/errors/400.pl >index 2e9324d6ea4..33c262cc18f 100755 >--- a/errors/400.pl >+++ b/errors/400.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/errors/401.pl b/errors/401.pl >index 8b67c981742..1d2d54d533b 100755 >--- a/errors/401.pl >+++ b/errors/401.pl >@@ -17,8 +17,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/errors/402.pl b/errors/402.pl >index 0e5719d6776..9febcafa514 100755 >--- a/errors/402.pl >+++ b/errors/402.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/errors/403.pl b/errors/403.pl >index dbb6ee67225..fcf17702447 100755 >--- a/errors/403.pl >+++ b/errors/403.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/errors/404.pl b/errors/404.pl >index 95215a7a8de..51b8aa354a0 100755 >--- a/errors/404.pl >+++ b/errors/404.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/errors/500.pl b/errors/500.pl >index 7f92673ce18..1518862a878 100755 >--- a/errors/500.pl >+++ b/errors/500.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/help.pl b/help.pl >index 4dd3ac3c122..92162539554 100755 >--- a/help.pl >+++ b/help.pl >@@ -20,7 +20,7 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use Koha::Manual; > >diff --git a/ill/ill-requests.pl b/ill/ill-requests.pl >index dfc27efcba2..9d35a471f94 100755 >--- a/ill/ill-requests.pl >+++ b/ill/ill-requests.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Notice::Templates; > use Koha::AuthorisedValues; > use Koha::Illcomment; >diff --git a/installer/install.pl b/installer/install.pl >index be6ee27f8c6..ce8113353aa 100755 >--- a/installer/install.pl >+++ b/installer/install.pl >@@ -20,14 +20,14 @@ > use Modern::Perl; > use diagnostics; > >-use C4::InstallAuth; >+use C4::InstallAuth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use POSIX qw(strftime); > > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Templates; >-use C4::Languages qw(getAllLanguages getTranslatedLanguages); >+use C4::Languages qw( getAllLanguages getTranslatedLanguages ); > use C4::Installer; > use C4::Installer::PerlModules; > >diff --git a/installer/onboarding.pl b/installer/onboarding.pl >index 6680cd94d90..06e6b40fd71 100755 >--- a/installer/onboarding.pl >+++ b/installer/onboarding.pl >@@ -19,10 +19,10 @@ > > use Modern::Perl; > use C4::Context; >-use C4::InstallAuth; >+use C4::InstallAuth qw( checkauth get_template_and_user ); > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Members qw(checkcardnumber); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Members qw( checkcardnumber ); > use Koha::Patrons; > use Koha::Libraries; > use Koha::Database; >diff --git a/labels/label-create-pdf.pl b/labels/label-create-pdf.pl >index d35c5d36ea9..8cac13d5332 100755 >--- a/labels/label-create-pdf.pl >+++ b/labels/label-create-pdf.pl >@@ -21,7 +21,7 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use C4::Creators; > use C4::Labels; >diff --git a/labels/label-edit-batch.pl b/labels/label-edit-batch.pl >index c6e5930e838..a22e1a5474b 100755 >--- a/labels/label-edit-batch.pl >+++ b/labels/label-edit-batch.pl >@@ -23,8 +23,8 @@ use vars qw($debug); > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Labels; > >diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl >index b5f279c1e08..35c132e79d5 100755 >--- a/labels/label-edit-layout.pl >+++ b/labels/label-edit-layout.pl >@@ -23,8 +23,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use POSIX; > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Labels; > >diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl >index 3569f574fc0..3a156fa53ce 100755 >--- a/labels/label-edit-profile.pl >+++ b/labels/label-edit-profile.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Labels; > >diff --git a/labels/label-edit-range.pl b/labels/label-edit-range.pl >index 4ff6c9b9965..7dd2c2af757 100755 >--- a/labels/label-edit-range.pl >+++ b/labels/label-edit-range.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl >index 197b336c437..75fe10f1de7 100755 >--- a/labels/label-edit-template.pl >+++ b/labels/label-edit-template.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Labels; > >diff --git a/labels/label-home.pl b/labels/label-home.pl >index fee57edaa25..5ec590242b2 100755 >--- a/labels/label-home.pl >+++ b/labels/label-home.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >diff --git a/labels/label-item-search.pl b/labels/label-item-search.pl >index 3eed6974b9e..da74a0a5522 100755 >--- a/labels/label-item-search.pl >+++ b/labels/label-item-search.pl >@@ -24,11 +24,11 @@ use CGI qw ( -utf8 ); > use List::Util qw( max min ); > use POSIX qw(ceil); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Search qw(SimpleSearch); >-use C4::Biblio qw(TransformMarcToKoha); >+use C4::Search qw( new_record_from_zebra ); >+use C4::Biblio qw( TransformMarcToKoha ); > use C4::Creators::Lib qw(html_table); > use C4::Debug; > >diff --git a/labels/label-manage.pl b/labels/label-manage.pl >index 8f53a70ae7e..3ae7ff1a56e 100755 >--- a/labels/label-manage.pl >+++ b/labels/label-manage.pl >@@ -25,8 +25,8 @@ use vars qw($debug); > use CGI qw ( -utf8 ); > use Data::Dumper; > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Labels; > >diff --git a/labels/label-print.pl b/labels/label-print.pl >index 22d15ec3277..0b9ec589e1d 100755 >--- a/labels/label-print.pl >+++ b/labels/label-print.pl >@@ -23,8 +23,8 @@ use CGI qw ( -utf8 ); > use Data::Dumper; > > use C4::Context; >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators::Lib qw(get_all_templates get_all_layouts get_output_formats); > use C4::Labels::Batch; > >diff --git a/labels/spinelabel-home.pl b/labels/spinelabel-home.pl >index 74f2f1d1b0f..10ddd778ff2 100755 >--- a/labels/spinelabel-home.pl >+++ b/labels/spinelabel-home.pl >@@ -17,8 +17,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > # use Smart::Comments; >diff --git a/labels/spinelabel-print.pl b/labels/spinelabel-print.pl >index f34c1f811d4..8c0ee090a6e 100755 >--- a/labels/spinelabel-print.pl >+++ b/labels/spinelabel-print.pl >@@ -17,8 +17,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $scheme = C4::Context->preference('SpineLabelFormat'); > my $query = CGI->new; >diff --git a/mainpage.pl b/mainpage.pl >index 183b5e0fcd2..03ab38965b9 100755 >--- a/mainpage.pl >+++ b/mainpage.pl >@@ -21,11 +21,11 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::NewsChannels; # GetNewsToDisplay >-use C4::Tags qw/get_count_by_tag_status/; >+use C4::Tags qw( get_count_by_tag_status ); > use Koha::Patron::Modifications; > use Koha::Patron::Discharge; > use Koha::Reviews; >diff --git a/members/accountline-details.pl b/members/accountline-details.pl >index a5c37079aa2..699993db761 100755 >--- a/members/accountline-details.pl >+++ b/members/accountline-details.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use Koha::Patrons; > use Koha::Account::Lines; >diff --git a/members/apikeys.pl b/members/apikeys.pl >index fb9051d1c49..f6fde368e4e 100755 >--- a/members/apikeys.pl >+++ b/members/apikeys.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > > use Koha::ApiKeys; > use Koha::Patrons; >diff --git a/members/boraccount.pl b/members/boraccount.pl >index c2befdabd0f..5ccb908ea1d 100755 >--- a/members/boraccount.pl >+++ b/members/boraccount.pl >@@ -25,8 +25,8 @@ > use Modern::Perl; > use URI::Escape; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Members; > use C4::Accounts; >diff --git a/members/cancel-charge.pl b/members/cancel-charge.pl >index 4c655fa1747..2f5ff42514c 100755 >--- a/members/cancel-charge.pl >+++ b/members/cancel-charge.pl >@@ -19,7 +19,7 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use Koha::Token; > > my $cgi = CGI->new; >diff --git a/members/deletemem.pl b/members/deletemem.pl >index 492e00e581f..e60b77b9fdd 100755 >--- a/members/deletemem.pl >+++ b/members/deletemem.pl >@@ -28,8 +28,8 @@ use CGI qw ( -utf8 ); > use Try::Tiny; > > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user haspermission ); > use C4::Members; > use C4::Suggestions qw( SearchSuggestion ); > use Koha::Patrons; >diff --git a/members/discharge.pl b/members/discharge.pl >index 7e055c6fd81..699c4bd87b1 100755 >--- a/members/discharge.pl >+++ b/members/discharge.pl >@@ -31,8 +31,8 @@ use Modern::Perl; > use Carp; > > use CGI qw( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Reserves; > use C4::Letters; >diff --git a/members/discharges.pl b/members/discharges.pl >index de19751ee08..574f3d9d5e6 100755 >--- a/members/discharges.pl >+++ b/members/discharges.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Context; > use Koha::Patron::Discharge; > >diff --git a/members/files.pl b/members/files.pl >index 18487ae0229..92231761402 100755 >--- a/members/files.pl >+++ b/members/files.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Debug; > >diff --git a/members/guarantor_search.pl b/members/guarantor_search.pl >index b5d31ed0698..40142eb9131 100755 >--- a/members/guarantor_search.pl >+++ b/members/guarantor_search.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/members/holdshistory.pl b/members/holdshistory.pl >index 2b2db160d21..04cac234824 100755 >--- a/members/holdshistory.pl >+++ b/members/holdshistory.pl >@@ -19,8 +19,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Patrons; > >diff --git a/members/housebound.pl b/members/housebound.pl >index e3c06225b21..c8af38342e9 100755 >--- a/members/housebound.pl >+++ b/members/housebound.pl >@@ -26,9 +26,9 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use DateTime; > use Koha::DateUtils; > use Koha::Libraries; >diff --git a/members/ill-requests.pl b/members/ill-requests.pl >index 61737d73981..a874498466b 100755 >--- a/members/ill-requests.pl >+++ b/members/ill-requests.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use Koha::Patrons; > > my $input = CGI->new; >diff --git a/members/mancredit.pl b/members/mancredit.pl >index c691bc05a36..2317b6b6f89 100755 >--- a/members/mancredit.pl >+++ b/members/mancredit.pl >@@ -23,8 +23,8 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); > > use C4::Members; >diff --git a/members/maninvoice.pl b/members/maninvoice.pl >index a178a2be380..e6b98a47769 100755 >--- a/members/maninvoice.pl >+++ b/members/maninvoice.pl >@@ -25,8 +25,8 @@ > use Modern::Perl; > use Try::Tiny; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Members; > use C4::Accounts; >diff --git a/members/member-flags.pl b/members/member-flags.pl >index 6ba2005ff99..d1464b76d63 100755 >--- a/members/member-flags.pl >+++ b/members/member-flags.pl >@@ -7,8 +7,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth qw(:DEFAULT :EditPermissions); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user get_all_subpermissions get_user_subpermissions ); > use C4::Context; > use C4::Members; > #use C4::Acquisitions; >@@ -16,7 +16,7 @@ use C4::Members; > use Koha::Patron::Categories; > use Koha::Patrons; > >-use C4::Output; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use Koha::Token; > > my $input = CGI->new; >diff --git a/members/member-password.pl b/members/member-password.pl >index 323eb88f850..0229e85caa3 100755 >--- a/members/member-password.pl >+++ b/members/member-password.pl >@@ -6,9 +6,9 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use Koha::AuthUtils; >-use C4::Output; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Context; > use C4::Members; > use C4::Circulation; >diff --git a/members/member.pl b/members/member.pl >index 970015b22e7..9dee72b4b71 100755 >--- a/members/member.pl >+++ b/members/member.pl >@@ -24,8 +24,8 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw( -utf8 ); > use Koha::DateUtils; > use Koha::List::Patron; >diff --git a/members/memberentry.pl b/members/memberentry.pl >index da8a324c784..e7aafd257db 100755 >--- a/members/memberentry.pl >+++ b/members/memberentry.pl >@@ -26,15 +26,15 @@ use CGI qw ( -utf8 ); > use List::MoreUtils qw/uniq/; > > # internal modules >-use C4::Auth; >+use C4::Auth qw( get_template_and_user haspermission ); > use C4::Context; >-use C4::Output; >-use C4::Members; >-use C4::Koha; >+use C4::Output qw( output_and_exit output_and_exit_if_error output_html_with_http_headers ); >+use C4::Members qw( checkcardnumber get_cardnumber_length ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Log; >-use C4::Letters; >+use C4::Letters qw( SendAlerts ); > use C4::Form::MessagingPreferences; >-use Koha::AuthUtils; >+use Koha::AuthUtils qw( is_password_valid ); > use Koha::AuthorisedValues; > use Koha::Patron::Debarments; > use Koha::Cities; >diff --git a/members/members-home.pl b/members/members-home.pl >index 8ae49fac284..c6522c03482 100755 >--- a/members/members-home.pl >+++ b/members/members-home.pl >@@ -19,8 +19,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Members; > use Koha::Patron::Modifications; >diff --git a/members/members-update-do.pl b/members/members-update-do.pl >index 81a746ac41c..6d1548bf47e 100755 >--- a/members/members-update-do.pl >+++ b/members/members-update-do.pl >@@ -19,7 +19,7 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use C4::Context; > use Koha::Patrons; >diff --git a/members/members-update.pl b/members/members-update.pl >index acccb2b3800..533a39bd1c1 100755 >--- a/members/members-update.pl >+++ b/members/members-update.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Members; > use Koha::Patron::Attribute::Types; >diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl >index ca03168b001..bc26d96c83f 100755 >--- a/members/merge-patrons.pl >+++ b/members/merge-patrons.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Try::Tiny; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use Koha::Patrons; > >diff --git a/members/mod_debarment.pl b/members/mod_debarment.pl >index 1b7d4a4e914..622c5c83ad8 100755 >--- a/members/mod_debarment.pl >+++ b/members/mod_debarment.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use Koha::DateUtils; > use Koha::Patron::Debarments; > >diff --git a/members/moremember.pl b/members/moremember.pl >index 8f6e959850c..3f0f937fb14 100755 >--- a/members/moremember.pl >+++ b/members/moremember.pl >@@ -30,8 +30,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Form::MessagingPreferences; > use List::MoreUtils qw/uniq/; > use Koha::Patron::Attribute::Types; >diff --git a/members/notices.pl b/members/notices.pl >index 40bc6edf357..ebe47c13b43 100755 >--- a/members/notices.pl >+++ b/members/notices.pl >@@ -20,11 +20,11 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Members; >-use C4::Letters; >+use C4::Letters qw( GetMessage ResendMessage GetQueuedMessages ); > use Koha::Patrons; > use Koha::Patron::Categories; > >diff --git a/members/pay.pl b/members/pay.pl >index f56e793d55a..b15a2706916 100755 >--- a/members/pay.pl >+++ b/members/pay.pl >@@ -30,8 +30,8 @@ use Modern::Perl; > > use URI::Escape; > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Members; > use C4::Accounts; >diff --git a/members/paycollect.pl b/members/paycollect.pl >index 7fb55737e7f..97695fb4542 100755 >--- a/members/paycollect.pl >+++ b/members/paycollect.pl >@@ -22,8 +22,8 @@ use URI::Escape; > use CGI qw ( -utf8 ); > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Accounts; > use C4::Koha; >diff --git a/members/print_overdues.pl b/members/print_overdues.pl >index 4c4bcc2914d..897e084ba9e 100755 >--- a/members/print_overdues.pl >+++ b/members/print_overdues.pl >@@ -22,9 +22,9 @@ use Modern::Perl; > use CGI; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >-use C4::Overdues qw(parse_overdues_letter); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Overdues qw( parse_overdues_letter ); > > use Koha::Patrons; > >diff --git a/members/printfeercpt.pl b/members/printfeercpt.pl >index 2e3dff7b51e..1060318291f 100755 >--- a/members/printfeercpt.pl >+++ b/members/printfeercpt.pl >@@ -20,10 +20,10 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter ); > use Koha::Account::Lines; > > my $input = CGI->new; >diff --git a/members/printinvoice.pl b/members/printinvoice.pl >index 97b7f58f171..94844133c22 100755 >--- a/members/printinvoice.pl >+++ b/members/printinvoice.pl >@@ -20,10 +20,10 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter ); > use Koha::Account::Lines; > > my $input = CGI->new; >diff --git a/members/printslip.pl b/members/printslip.pl >index 2d80f9c09df..71d0541ce14 100755 >--- a/members/printslip.pl >+++ b/members/printslip.pl >@@ -35,9 +35,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >-use C4::Members; >+use C4::Auth qw( get_session get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Members qw( IssueSlip ); > use C4::Koha; > use Koha::DateUtils; > >diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl >index ae1e021ff3e..07d41775d99 100755 >--- a/members/purchase-suggestions.pl >+++ b/members/purchase-suggestions.pl >@@ -20,9 +20,9 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Suggestions; > use Koha::Patrons; >diff --git a/members/readingrec.pl b/members/readingrec.pl >index c8fddf33796..09b5327056d 100755 >--- a/members/readingrec.pl >+++ b/members/readingrec.pl >@@ -24,9 +24,9 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >-use C4::Members; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Members qw( GetAllIssues ); > use List::MoreUtils qw/any uniq/; > use Koha::DateUtils; > >diff --git a/members/routing-lists.pl b/members/routing-lists.pl >index dee5845a0dd..81ad7980ab0 100755 >--- a/members/routing-lists.pl >+++ b/members/routing-lists.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth qw/:DEFAULT/; >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Members; > use C4::Context; > use C4::Serials; >diff --git a/members/setstatus.pl b/members/setstatus.pl >index 66ae8b586c6..be36e600269 100755 >--- a/members/setstatus.pl >+++ b/members/setstatus.pl >@@ -28,7 +28,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Members; >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use Koha::Patrons; > > >diff --git a/members/statistics.pl b/members/statistics.pl >index 93367b3ed79..a7b0d9847a5 100755 >--- a/members/statistics.pl >+++ b/members/statistics.pl >@@ -25,11 +25,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Members; >-use C4::Members::Statistics; >-use C4::Output; >+use C4::Members::Statistics qw( get_fields GetPrecedentStateByBorrower GetTotalIssuesTodayByBorrower GetTotalIssuesReturnedTodayByBorrower ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use Koha::Patrons; > use Koha::Patron::Categories; > >diff --git a/members/summary-print.pl b/members/summary-print.pl >index c40159b7962..0de51dfd3cd 100755 >--- a/members/summary-print.pl >+++ b/members/summary-print.pl >@@ -19,12 +19,12 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Circulation qw( GetIssuingCharges ); > use C4::Reserves; >-use C4::Items; >+use C4::Items qw( sub ); > use Koha::DateUtils; > use Koha::Holds; > use Koha::ItemTypes; >diff --git a/members/update-child.pl b/members/update-child.pl >index 7e7edad4638..a88dfcac130 100755 >--- a/members/update-child.pl >+++ b/members/update-child.pl >@@ -29,8 +29,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers output_and_exit_if_error output_and_exit ); > use Koha::Patrons; > use Koha::Patron::Categories; > use Koha::Patrons; >diff --git a/misc/add_date_fields_to_marc_records.pl b/misc/add_date_fields_to_marc_records.pl >index b7ab77c2cb6..024a40c0e68 100755 >--- a/misc/add_date_fields_to_marc_records.pl >+++ b/misc/add_date_fields_to_marc_records.pl >@@ -28,7 +28,7 @@ use Getopt::Long; > use Pod::Usage; > use MARC::Field; > >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ModBiblio ); > use Koha::DateUtils qw( dt_from_string ); > > my ( $verbose, $help, $confirm, $where, @fields, $unless_exists_field ); >diff --git a/misc/batchDeleteUnusedSubfields.pl b/misc/batchDeleteUnusedSubfields.pl >index a80d4fdd6f4..e43d914e710 100755 >--- a/misc/batchDeleteUnusedSubfields.pl >+++ b/misc/batchDeleteUnusedSubfields.pl >@@ -14,7 +14,7 @@ BEGIN { > use Koha::Script; > use MARC::Record; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcStructure ); > use Time::HiRes qw(gettimeofday); > > use Getopt::Long; >diff --git a/misc/batchImportMARCWithBiblionumbers.pl b/misc/batchImportMARCWithBiblionumbers.pl >index f8a12b5c5cf..6a7329a66d6 100755 >--- a/misc/batchImportMARCWithBiblionumbers.pl >+++ b/misc/batchImportMARCWithBiblionumbers.pl >@@ -14,7 +14,7 @@ BEGIN { > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcFromKohaField ); > use MARC::Record; > use MARC::File::USMARC; > use MARC::File::XML; >diff --git a/misc/batchRebuildBiblioTables.pl b/misc/batchRebuildBiblioTables.pl >index edc7c16d336..50a6cfc89ad 100755 >--- a/misc/batchRebuildBiblioTables.pl >+++ b/misc/batchRebuildBiblioTables.pl >@@ -15,9 +15,9 @@ BEGIN { > # Koha modules used > use Koha::Script; > use MARC::Record; >-use C4::Charset; >+use C4::Charset qw( StripNonXmlChars ); > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetXmlBiblio TransformMarcToKoha _koha_modify_biblio _koha_modify_biblioitem_nonmarc ); > use Time::HiRes qw(gettimeofday); > > use Getopt::Long; >diff --git a/misc/batchRebuildItemsTables.pl b/misc/batchRebuildItemsTables.pl >index 5bb40e5d353..a0d59ddd3f2 100755 >--- a/misc/batchRebuildItemsTables.pl >+++ b/misc/batchRebuildItemsTables.pl >@@ -10,8 +10,8 @@ use Time::HiRes qw(gettimeofday); > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetMarcFromKohaField GetMarcBiblio ); >+use C4::Items qw( sub ModItemFromMarc ); > > =head1 NAME > >diff --git a/misc/batchRepairMissingBiblionumbers.pl b/misc/batchRepairMissingBiblionumbers.pl >index 69e15a6c15f..781a80571f4 100755 >--- a/misc/batchRepairMissingBiblionumbers.pl >+++ b/misc/batchRepairMissingBiblionumbers.pl >@@ -14,7 +14,7 @@ BEGIN { > # Koha modules used > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio _koha_marc_update_bib_ids ModBiblio ModBiblioMarc ); > > > my $dbh = C4::Context->dbh; >diff --git a/misc/batchdeletebiblios.pl b/misc/batchdeletebiblios.pl >index 3ae5cd96830..289fb855359 100755 >--- a/misc/batchdeletebiblios.pl >+++ b/misc/batchdeletebiblios.pl >@@ -6,7 +6,7 @@ use Pod::Usage; > use IO::File; > > use Koha::Script; >-use C4::Biblio; >+use C4::Biblio qw( DelBiblio ); > > my $help; > GetOptions( >diff --git a/misc/commit_file.pl b/misc/commit_file.pl >index 639f7dfb42f..5b4b53186fb 100755 >--- a/misc/commit_file.pl >+++ b/misc/commit_file.pl >@@ -11,7 +11,7 @@ BEGIN { > > use Koha::Script; > use C4::Context; >-use C4::ImportBatch; >+use C4::ImportBatch qw( GetImportBatch sub BatchCommitRecords BatchRevertRecords ); > use Getopt::Long; > > $| = 1; >diff --git a/misc/cronjobs/advance_notices.pl b/misc/cronjobs/advance_notices.pl >index f1df975c263..3fc18ac99bf 100755 >--- a/misc/cronjobs/advance_notices.pl >+++ b/misc/cronjobs/advance_notices.pl >@@ -50,7 +50,7 @@ BEGIN { > use Koha::Script -cron; > use C4::Biblio; > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( get_item_content EnqueueLetter GetPreparedLetter ); > use C4::Members; > use C4::Members::Messaging; > use C4::Overdues; >diff --git a/misc/cronjobs/archive_purchase_suggestions.pl b/misc/cronjobs/archive_purchase_suggestions.pl >index bd16600d03c..02e68808e06 100755 >--- a/misc/cronjobs/archive_purchase_suggestions.pl >+++ b/misc/cronjobs/archive_purchase_suggestions.pl >@@ -9,7 +9,7 @@ use Koha::Script -cron; > > use Koha::DateUtils qw( dt_from_string output_pref ); > use Koha::Suggestions; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > > my ( $help, $verbose, $confirm, $age, $age_date_field, @statuses ); > GetOptions( >diff --git a/misc/cronjobs/automatic_item_modification_by_age.pl b/misc/cronjobs/automatic_item_modification_by_age.pl >index e944ac8c11f..af9f54ceb5c 100755 >--- a/misc/cronjobs/automatic_item_modification_by_age.pl >+++ b/misc/cronjobs/automatic_item_modification_by_age.pl >@@ -8,7 +8,7 @@ use JSON; > > use Koha::Script -cron; > use C4::Context; >-use C4::Items; >+use C4::Items qw( ToggleNewStatus sub ); > use C4::Log; > > # Getting options >diff --git a/misc/cronjobs/automatic_renewals.pl b/misc/cronjobs/automatic_renewals.pl >index c8958cdc9d5..fdf1b2d3d86 100755 >--- a/misc/cronjobs/automatic_renewals.pl >+++ b/misc/cronjobs/automatic_renewals.pl >@@ -79,10 +79,10 @@ use Pod::Usage; > use Getopt::Long; > > use Koha::Script -cron; >-use C4::Circulation; >+use C4::Circulation qw( CanBookBeRenewed AddRenewal ); > use C4::Context; > use C4::Log; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use Koha::Checkouts; > use Koha::Libraries; > use Koha::Patrons; >diff --git a/misc/cronjobs/build_browser_and_cloud.pl b/misc/cronjobs/build_browser_and_cloud.pl >index d6df1be6b7c..46551ca041a 100755 >--- a/misc/cronjobs/build_browser_and_cloud.pl >+++ b/misc/cronjobs/build_browser_and_cloud.pl >@@ -13,7 +13,7 @@ BEGIN { > use Koha::Script -cron; > use C4::Koha; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ); > use Date::Calc; > use Time::HiRes qw(gettimeofday); > use ZOOM; >diff --git a/misc/cronjobs/cart_to_shelf.pl b/misc/cronjobs/cart_to_shelf.pl >index 414f6e37208..0d761a5ef68 100755 >--- a/misc/cronjobs/cart_to_shelf.pl >+++ b/misc/cronjobs/cart_to_shelf.pl >@@ -29,7 +29,7 @@ use strict; > use warnings; > > use Koha::Script -cron; >-use C4::Items qw/ CartToShelf /; >+use C4::Items qw( CartToShelf ); > use C4::Log; > > BEGIN { >diff --git a/misc/cronjobs/check-url-quick.pl b/misc/cronjobs/check-url-quick.pl >index 93fcd97a10b..0a794d59d52 100755 >--- a/misc/cronjobs/check-url-quick.pl >+++ b/misc/cronjobs/check-url-quick.pl >@@ -23,7 +23,7 @@ use Getopt::Long; > > use Koha::Script -cron; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ); > use AnyEvent; > use AnyEvent::HTTP; > use Encode; >diff --git a/misc/cronjobs/delete_items.pl b/misc/cronjobs/delete_items.pl >index df5d23aa661..7422b5c34f1 100755 >--- a/misc/cronjobs/delete_items.pl >+++ b/misc/cronjobs/delete_items.pl >@@ -4,7 +4,7 @@ use Getopt::Long; > > use Koha::Script -cron; > use C4::Context; >-use C4::Items; >+use C4::Items qw( sub ); > use C4::Circulation; > use Modern::Perl; > use Pod::Usage; >diff --git a/misc/cronjobs/delete_patrons.pl b/misc/cronjobs/delete_patrons.pl >index d0847c8b621..8d0769b36ca 100755 >--- a/misc/cronjobs/delete_patrons.pl >+++ b/misc/cronjobs/delete_patrons.pl >@@ -6,7 +6,7 @@ use Pod::Usage; > use Getopt::Long; > > use Koha::Script -cron; >-use C4::Members; >+use C4::Members qw( GetBorrowersToExpunge ); > use Koha::DateUtils; > use Koha::Patrons; > use C4::Log; >diff --git a/misc/cronjobs/delete_records_via_leader.pl b/misc/cronjobs/delete_records_via_leader.pl >index 0287e43f577..22b10d0ed98 100755 >--- a/misc/cronjobs/delete_records_via_leader.pl >+++ b/misc/cronjobs/delete_records_via_leader.pl >@@ -34,7 +34,7 @@ BEGIN { > use Getopt::Long; > use Pod::Usage; > use Koha::Script -cron; >-use C4::Biblio; >+use C4::Biblio qw( DelBiblio ); > use C4::Items; > use Koha::Database; > use Koha::Biblios; >diff --git a/misc/cronjobs/edi_cron.pl b/misc/cronjobs/edi_cron.pl >index ff6ef95bcc9..50220e6b97d 100755 >--- a/misc/cronjobs/edi_cron.pl >+++ b/misc/cronjobs/edi_cron.pl >@@ -33,7 +33,7 @@ use Koha::Script -cron; > use C4::Context; > use Log::Log4perl qw(:easy); > use Koha::Database; >-use Koha::EDI qw( process_quote process_invoice process_ordrsp); >+use Koha::EDI qw( process_quote process_invoice process_ordrsp ); > use Koha::Edifact::Transport; > use Koha::Plugins::Handler; > use Fcntl qw( :DEFAULT :flock :seek ); >diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl >index afc6b4d5566..ef90ac3f222 100755 >--- a/misc/cronjobs/fines.pl >+++ b/misc/cronjobs/fines.pl >@@ -32,7 +32,7 @@ use 5.010; > > use Koha::Script -cron; > use C4::Context; >-use C4::Overdues; >+use C4::Overdues qw( Getoverdues CalcFine UpdateFine ); > use Getopt::Long; > use Carp; > use File::Spec; >diff --git a/misc/cronjobs/gather_print_notices.pl b/misc/cronjobs/gather_print_notices.pl >index ec9e32c2ce7..5da3f0f04ee 100755 >--- a/misc/cronjobs/gather_print_notices.pl >+++ b/misc/cronjobs/gather_print_notices.pl >@@ -13,7 +13,7 @@ use CGI qw( utf8 ); # NOT a CGI script, this is just to keep C4::Templates::gett > use Koha::Script -cron; > use C4::Context; > use C4::Debug; >-use C4::Letters; >+use C4::Letters qw( GetPrintMessages _set_message_status ); > use C4::Templates; > use File::Spec; > use Pod::Usage; >diff --git a/misc/cronjobs/import_webservice_batch.pl b/misc/cronjobs/import_webservice_batch.pl >index aa18edce517..8c9a17cadac 100755 >--- a/misc/cronjobs/import_webservice_batch.pl >+++ b/misc/cronjobs/import_webservice_batch.pl >@@ -32,7 +32,7 @@ BEGIN { > use Getopt::Long; > use Pod::Usage; > use Koha::Script -cron; >-use C4::ImportBatch; >+use C4::ImportBatch qw( BatchCommitRecords ); > > my ($help, $framework); > >diff --git a/misc/cronjobs/longoverdue.pl b/misc/cronjobs/longoverdue.pl >index c12a95d6f2d..5ce1cfa1b1e 100755 >--- a/misc/cronjobs/longoverdue.pl >+++ b/misc/cronjobs/longoverdue.pl >@@ -37,9 +37,9 @@ BEGIN { > use Getopt::Long; > use Pod::Usage; > >-use C4::Circulation qw/LostItem MarkIssueReturned/; >+use C4::Circulation qw( LostItem MarkIssueReturned ); > use C4::Context; >-use C4::Items; >+use C4::Items qw( sub ); > use C4::Log; > use Koha::ItemTypes; > use Koha::Patron::Categories; >diff --git a/misc/cronjobs/membership_expiry.pl b/misc/cronjobs/membership_expiry.pl >index 5038ce1f9f1..d7d15d0c777 100755 >--- a/misc/cronjobs/membership_expiry.pl >+++ b/misc/cronjobs/membership_expiry.pl >@@ -128,7 +128,7 @@ BEGIN { > > use Koha::Script -cron; > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Log; > > use Koha::Patrons; >diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl >index bf1a370a111..76d7cd5a5e0 100755 >--- a/misc/cronjobs/overdue_notices.pl >+++ b/misc/cronjobs/overdue_notices.pl >@@ -36,8 +36,8 @@ use DateTime::Duration; > > use Koha::Script -cron; > use C4::Context; >-use C4::Letters; >-use C4::Overdues qw(GetFine GetOverdueMessageTransportTypes parse_overdues_letter); >+use C4::Letters qw( getletter get_item_content EnqueueLetter ); >+use C4::Overdues qw( GetBranchcodesWithOverdueRules GetOverdueMessageTransportTypes parse_overdues_letter ); > use C4::Log; > use Koha::Patron::Debarments qw(AddUniqueDebarment); > use Koha::DateUtils; >diff --git a/misc/cronjobs/patron_emailer.pl b/misc/cronjobs/patron_emailer.pl >index 67a33dedfb0..6ee1ff98e5c 100755 >--- a/misc/cronjobs/patron_emailer.pl >+++ b/misc/cronjobs/patron_emailer.pl >@@ -30,7 +30,7 @@ use Getopt::Long; > use Pod::Usage; > > use C4::Log; >-use C4::Reports::Guided; >+use C4::Reports::Guided qw( EmailReport ); > > cronlogaction(); > >diff --git a/misc/cronjobs/process_message_queue.pl b/misc/cronjobs/process_message_queue.pl >index a903f1e06d3..cc9a85ae1f8 100755 >--- a/misc/cronjobs/process_message_queue.pl >+++ b/misc/cronjobs/process_message_queue.pl >@@ -27,7 +27,7 @@ BEGIN { > } > > use Koha::Script -cron; >-use C4::Letters; >+use C4::Letters qw( SendQueuedMessages ); > use C4::Log; > use Getopt::Long; > use Try::Tiny; >diff --git a/misc/cronjobs/runreport.pl b/misc/cronjobs/runreport.pl >index 3e81e08a979..c43616f7fb0 100755 >--- a/misc/cronjobs/runreport.pl >+++ b/misc/cronjobs/runreport.pl >@@ -21,7 +21,7 @@ > use Modern::Perl; > > use Koha::Script -cron; >-use C4::Reports::Guided; # 0.12 >+use C4::Reports::Guided qw( store_results execute_query ); > use Koha::Reports; > use C4::Context; > use C4::Log; >diff --git a/misc/cronjobs/serialsUpdate.pl b/misc/cronjobs/serialsUpdate.pl >index 758527252f2..e5f4ac34438 100755 >--- a/misc/cronjobs/serialsUpdate.pl >+++ b/misc/cronjobs/serialsUpdate.pl >@@ -31,10 +31,10 @@ BEGIN { > use Koha::Script -cron; > use C4::Context; > use C4::Debug; >-use C4::Serials; >+use C4::Serials qw( GetSubscription GetNextDate ModSerialStatus ); > use C4::Log; > use Koha::DateUtils; >-use C4::Serials::Frequency; >+use C4::Serials qw( GetSubscription GetNextDate ModSerialStatus ); > > use Date::Calc qw/Date_to_Days check_date/; > use Getopt::Long; >diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl >index 1e7d2877028..4a4673ab3fa 100755 >--- a/misc/cronjobs/staticfines.pl >+++ b/misc/cronjobs/staticfines.pl >@@ -40,7 +40,7 @@ use Date::Calc qw/Date_to_Days/; > use Koha::Script -cron; > use C4::Context; > use C4::Circulation; >-use C4::Overdues; >+use C4::Overdues qw( checkoverdues Getoverdues CalcFine GetFine ); > use C4::Calendar qw(); # don't need any exports from Calendar > use C4::Biblio; > use C4::Debug; # supplying $debug and $cgi_debug >diff --git a/misc/cronjobs/stockrotation.pl b/misc/cronjobs/stockrotation.pl >index 3a30d582265..6da0e457275 100755 >--- a/misc/cronjobs/stockrotation.pl >+++ b/misc/cronjobs/stockrotation.pl >@@ -112,7 +112,7 @@ use Getopt::Long qw/HelpMessage :config gnu_getopt/; > > use Koha::Script -cron; > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use Koha::StockRotationRotas; > > my $admin_email = ''; >diff --git a/misc/cronjobs/update_totalissues.pl b/misc/cronjobs/update_totalissues.pl >index f1b621b3443..fcd8f871d43 100755 >--- a/misc/cronjobs/update_totalissues.pl >+++ b/misc/cronjobs/update_totalissues.pl >@@ -34,7 +34,7 @@ use Pod::Usage; > use Koha::Script -cron; > use Koha::DateUtils qw/ dt_from_string /; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( UpdateTotalIssues ); > use C4::Log; > use DateTime; > use DateTime::Format::MySQL; >diff --git a/misc/devel/get_prepared_letter.pl b/misc/devel/get_prepared_letter.pl >index 45f5544d824..58dbef2db6b 100755 >--- a/misc/devel/get_prepared_letter.pl >+++ b/misc/devel/get_prepared_letter.pl >@@ -73,7 +73,7 @@ use Getopt::Long; > use JSON; > use Pod::Usage; > >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter ); > > my $help; > my ( $module, $letter_code, $branchcode, $message_transport_type, $lang, >diff --git a/misc/link_bibs_to_authorities.pl b/misc/link_bibs_to_authorities.pl >index e7df4d57f67..dfe83320734 100755 >--- a/misc/link_bibs_to_authorities.pl >+++ b/misc/link_bibs_to_authorities.pl >@@ -13,7 +13,7 @@ BEGIN { > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode LinkBibHeadingsToAuthorities ModBiblio ); > use Getopt::Long; > use Pod::Usage; > use Data::Dumper; >diff --git a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl >index 5e0cd37fcc4..5c3a975de2d 100755 >--- a/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl >+++ b/misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl >@@ -13,7 +13,7 @@ BEGIN { > } > > use Koha::Script; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ModBiblio ); > use Getopt::Long; > > sub _read_marc_code { >diff --git a/misc/maintenance/fix_tags_weight.pl b/misc/maintenance/fix_tags_weight.pl >index a1f8085edd3..446fca85890 100755 >--- a/misc/maintenance/fix_tags_weight.pl >+++ b/misc/maintenance/fix_tags_weight.pl >@@ -20,7 +20,7 @@ > use Modern::Perl; > > use C4::Context; >-use C4::Tags; >+use C4::Tags qw( add_tag_approval add_tag ); > > use Koha::Script; > use Koha::Database; >diff --git a/misc/maintenance/process_record_through_filter.pl b/misc/maintenance/process_record_through_filter.pl >index a9d92d33adb..6acfc8eb515 100755 >--- a/misc/maintenance/process_record_through_filter.pl >+++ b/misc/maintenance/process_record_through_filter.pl >@@ -10,7 +10,7 @@ use warnings; > use Koha::Script; > use Koha::RecordProcessor; > use Data::Dumper; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ); > > my $record = GetMarcBiblio({ biblionumber => $ARGV[0] }); > >diff --git a/misc/maintenance/remove_items_from_biblioitems.pl b/misc/maintenance/remove_items_from_biblioitems.pl >index d78ad696ad9..6524807eedb 100755 >--- a/misc/maintenance/remove_items_from_biblioitems.pl >+++ b/misc/maintenance/remove_items_from_biblioitems.pl >@@ -24,7 +24,7 @@ $|=1; > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ModBiblio GetFrameworkCode ); > use Getopt::Long; > > my ($wherestring, $run, $silent, $want_help); >diff --git a/misc/maintenance/sanitize_records.pl b/misc/maintenance/sanitize_records.pl >index f9084e8e3b3..bd9202eca7e 100755 >--- a/misc/maintenance/sanitize_records.pl >+++ b/misc/maintenance/sanitize_records.pl >@@ -23,7 +23,7 @@ use Koha::Script; > use C4::Charset qw( SanitizeRecord ); > use C4::Context; > use DBI; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode ModBiblio ); > use Getopt::Long; > use Pod::Usage; > >diff --git a/misc/maintenance/search_for_data_inconsistencies.pl b/misc/maintenance/search_for_data_inconsistencies.pl >index 433f668040b..a23e7abdc70 100755 >--- a/misc/maintenance/search_for_data_inconsistencies.pl >+++ b/misc/maintenance/search_for_data_inconsistencies.pl >@@ -25,7 +25,7 @@ use Koha::BiblioFrameworks; > use Koha::Biblioitems; > use Koha::Items; > use Koha::ItemTypes; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcFromKohaField ); > > { > my $items = Koha::Items->search({ -or => { homebranch => undef, holdingbranch => undef }}); >diff --git a/misc/maintenance/touch_all_biblios.pl b/misc/maintenance/touch_all_biblios.pl >index 8d65f21eedb..a211630eec7 100755 >--- a/misc/maintenance/touch_all_biblios.pl >+++ b/misc/maintenance/touch_all_biblios.pl >@@ -31,7 +31,7 @@ use Getopt::Long; > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ModBiblio ); > use Pod::Usage; > > >diff --git a/misc/maintenance/touch_all_items.pl b/misc/maintenance/touch_all_items.pl >index dbf16092217..ba4a497c93d 100755 >--- a/misc/maintenance/touch_all_items.pl >+++ b/misc/maintenance/touch_all_items.pl >@@ -31,7 +31,7 @@ use Getopt::Long; > > use Koha::Script; > use C4::Context; >-use C4::Items; >+use C4::Items qw( sub ); > use Koha::Items; > use Pod::Usage; > >diff --git a/misc/migration_tools/buildEDITORS.pl b/misc/migration_tools/buildEDITORS.pl >index bb11d458815..8a25459e2a0 100755 >--- a/misc/migration_tools/buildEDITORS.pl >+++ b/misc/migration_tools/buildEDITORS.pl >@@ -10,7 +10,7 @@ use MARC::Record; > use MARC::Batch; > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ); > use C4::AuthoritiesMarc; > use Time::HiRes qw(gettimeofday); > >diff --git a/misc/migration_tools/build_oai_sets.pl b/misc/migration_tools/build_oai_sets.pl >index c7b73a2d7d1..cdc577c86e6 100755 >--- a/misc/migration_tools/build_oai_sets.pl >+++ b/misc/migration_tools/build_oai_sets.pl >@@ -44,8 +44,8 @@ use Getopt::Std; > > use Koha::Script; > use C4::Context; >-use C4::Charset qw/StripNonXmlChars/; >-use C4::Biblio; >+use C4::Charset qw( StripNonXmlChars ); >+use C4::Biblio qw( EmbedItemsInMarcBiblio ); > use C4::OAI::Sets; > > my %opts; >diff --git a/misc/migration_tools/bulkmarcimport.pl b/misc/migration_tools/bulkmarcimport.pl >index cb3b5c6a705..7c3a6ff933f 100755 >--- a/misc/migration_tools/bulkmarcimport.pl >+++ b/misc/migration_tools/bulkmarcimport.pl >@@ -20,11 +20,11 @@ use Encode; > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcFromKohaField ModBiblio AddBiblio _strip_item_fields ModBiblioMarc ); > use C4::Koha; > use C4::Debug; >-use C4::Charset; >-use C4::Items; >+use C4::Charset qw( MarcToUTF8Record SetUTF8Flag ); >+use C4::Items qw( sub AddItemBatchFromMarc ); > use C4::MarcModificationTemplates; > > use YAML::XS; >diff --git a/misc/migration_tools/create_analytical_rel.pl b/misc/migration_tools/create_analytical_rel.pl >index 2de9c23d457..65ebd2fc553 100755 >--- a/misc/migration_tools/create_analytical_rel.pl >+++ b/misc/migration_tools/create_analytical_rel.pl >@@ -11,8 +11,8 @@ BEGIN { > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetMarcBiblio ModBiblio ); >+use C4::Items qw( sub ); > use Koha::Items; > use Getopt::Long; > >diff --git a/misc/migration_tools/import_lexile.pl b/misc/migration_tools/import_lexile.pl >index 72347870a10..eb8340e4b43 100755 >--- a/misc/migration_tools/import_lexile.pl >+++ b/misc/migration_tools/import_lexile.pl >@@ -33,7 +33,7 @@ use Text::CSV; > > use Koha::Script; > use C4::Context; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ModBiblio ); > use C4::Koha qw( GetVariationsOfISBN ); > > use Koha::Biblios; >diff --git a/misc/migration_tools/rebuild_zebra.pl b/misc/migration_tools/rebuild_zebra.pl >index 18da8026ada..2bf6360110f 100755 >--- a/misc/migration_tools/rebuild_zebra.pl >+++ b/misc/migration_tools/rebuild_zebra.pl >@@ -23,9 +23,9 @@ use Getopt::Long; > use Fcntl qw(:flock); > use File::Temp qw/ tempdir /; > use File::Path; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcFromKohaField GetXmlBiblio GetMarcBiblio _koha_marc_update_bib_ids ); > use C4::AuthoritiesMarc; >-use C4::Items; >+use C4::Items qw( sub GetItemsInfo Item2Marc ); > use Koha::RecordProcessor; > use Koha::Caches; > use XML::LibXML; >diff --git a/misc/migration_tools/switch_marc21_series_info.pl b/misc/migration_tools/switch_marc21_series_info.pl >index 9d43d47cbde..b145eaa35f1 100755 >--- a/misc/migration_tools/switch_marc21_series_info.pl >+++ b/misc/migration_tools/switch_marc21_series_info.pl >@@ -30,7 +30,7 @@ BEGIN { > } > > use Koha::Script; >-use C4::Biblio; >+use C4::Biblio qw( GetFrameworkCode GetMarcBiblio ModBiblio ModBiblioMarc ); > use C4::Context; > use Getopt::Long; > >diff --git a/misc/migration_tools/upgradeitems.pl b/misc/migration_tools/upgradeitems.pl >index cc63cd499fc..da612febff8 100755 >--- a/misc/migration_tools/upgradeitems.pl >+++ b/misc/migration_tools/upgradeitems.pl >@@ -5,8 +5,8 @@ use strict; > > use Koha::Script; > use C4::Context; >-use C4::Items; >-use C4::Biblio; >+use C4::Items qw( sub ModItemFromMarc ); >+use C4::Biblio qw( GetMarcBiblio ); > > my $dbh=C4::Context->dbh; > >diff --git a/misc/mod_zebraqueue.pl b/misc/mod_zebraqueue.pl >index 240aad44fa5..cf128ef3556 100755 >--- a/misc/mod_zebraqueue.pl >+++ b/misc/mod_zebraqueue.pl >@@ -24,7 +24,7 @@ use Getopt::Long; > use Pod::Usage; > > use Koha::Script; >-use C4::Biblio; >+use C4::Biblio qw( ModZebra ); > > my @biblios; > my @authorities; >diff --git a/misc/recreateIssueStatistics.pl b/misc/recreateIssueStatistics.pl >index 8ff314e225d..a710c353c76 100755 >--- a/misc/recreateIssueStatistics.pl >+++ b/misc/recreateIssueStatistics.pl >@@ -25,7 +25,7 @@ use warnings; > > use Koha::Script; > use C4::Context; >-use C4::Items; >+use C4::Items qw( sub ); > use Data::Dumper; > use Getopt::Long; > use Koha::Items; >diff --git a/misc/sip_cli_emulator.pl b/misc/sip_cli_emulator.pl >index 8336ced436a..00a54a643fb 100755 >--- a/misc/sip_cli_emulator.pl >+++ b/misc/sip_cli_emulator.pl >@@ -23,8 +23,8 @@ use Socket qw(:crlf); > use IO::Socket::INET; > use Getopt::Long; > >-use C4::SIP::Sip::Constants qw(:all); >-use C4::SIP::Sip; >+use C4::SIP::Sip qw( timestamp ); >+use C4::SIP::Sip qw( timestamp ); > > use constant { LANGUAGE => '001' }; > >diff --git a/misc/stage_file.pl b/misc/stage_file.pl >index 16a74d0576f..1970ce8e571 100755 >--- a/misc/stage_file.pl >+++ b/misc/stage_file.pl >@@ -29,7 +29,7 @@ BEGIN { > > use Koha::Script; > use C4::Context; >-use C4::ImportBatch; >+use C4::ImportBatch qw( sub RecordsFromISO2709File RecordsFromMARCXMLFile BatchStageMarcRecords SetImportBatchMatcher SetImportBatchOverlayAction SetImportBatchNoMatchAction SetImportBatchItemAction BatchFindDuplicates ); > use C4::Matcher; > use C4::MarcModificationTemplates; > use Getopt::Long; >diff --git a/misc/translator/TmplTokenizer.pm b/misc/translator/TmplTokenizer.pm >index 05cc54ea6b6..e594cf93581 100644 >--- a/misc/translator/TmplTokenizer.pm >+++ b/misc/translator/TmplTokenizer.pm >@@ -1,7 +1,7 @@ > package TmplTokenizer; > > use Modern::Perl; >-use C4::TmplTokenType; >+use C4::TmplTokenType qw( CDATA UNKNOWN DIRECTIVE TEXT TAG TEXT_PARAMETRIZED to_string ); > use C4::TmplToken; > use C4::TTParser; > use VerboseWarnings qw( pedantic_p error_normal warn_normal warn_pedantic ); >diff --git a/offline_circ/download.pl b/offline_circ/download.pl >index 838e63ee08d..c80a2260137 100755 >--- a/offline_circ/download.pl >+++ b/offline_circ/download.pl >@@ -20,7 +20,7 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use JSON; >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Output; > use C4::Context; > use C4::Koha; >diff --git a/offline_circ/enqueue_koc.pl b/offline_circ/enqueue_koc.pl >index 7ca5699f2ec..721798483a6 100755 >--- a/offline_circ/enqueue_koc.pl >+++ b/offline_circ/enqueue_koc.pl >@@ -21,14 +21,14 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; > use C4::Biblio; > use C4::Accounts; >-use C4::Circulation; >-use C4::Items; >+use C4::Circulation qw( AddOfflineOperation ); >+use C4::Items qw( sub ); > use C4::Members; > use C4::Stats; > use Koha::Checkouts; >diff --git a/offline_circ/list.pl b/offline_circ/list.pl >index f5146444c4a..f25d4e6c96b 100755 >--- a/offline_circ/list.pl >+++ b/offline_circ/list.pl >@@ -21,11 +21,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; >-use C4::Circulation; >+use C4::Circulation qw( GetOfflineOperations GetOfflineOperation ); > use C4::Members; > use C4::Biblio; > use Koha::Patrons; >diff --git a/offline_circ/process.pl b/offline_circ/process.pl >index 39963e67eeb..09520a1caee 100755 >--- a/offline_circ/process.pl >+++ b/offline_circ/process.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Circulation; >+use C4::Auth qw( get_template_and_user ); >+use C4::Circulation qw( GetOfflineOperation ProcessOfflineOperation DeleteOfflineOperation ); > > my $query = CGI->new; > >diff --git a/offline_circ/process_koc.pl b/offline_circ/process_koc.pl >index ce2c6c5524d..577e13fa4b5 100755 >--- a/offline_circ/process_koc.pl >+++ b/offline_circ/process_koc.pl >@@ -23,14 +23,14 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Carp; > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; > use C4::Biblio; > use C4::Accounts; >-use C4::Circulation; >-use C4::Items; >+use C4::Circulation qw( barcodedecode GetOpenIssue AddRenewal AddIssue MarkIssueReturned ); >+use C4::Items qw( sub ModDateLastSeen ); > use C4::Members; > use C4::Stats; > use C4::BackgroundJob; >diff --git a/offline_circ/service.pl b/offline_circ/service.pl >index bbae44bb74e..3ed1c26457b 100755 >--- a/offline_circ/service.pl >+++ b/offline_circ/service.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Circulation; >+use C4::Auth qw( check_api_auth check_cookie_auth ); >+use C4::Circulation qw( AddOfflineOperation ProcessOfflineOperation ); > use Koha::DateUtils; > use DateTime::TimeZone; > >diff --git a/opac/clubs/clubs-tab.pl b/opac/clubs/clubs-tab.pl >index 312f9b10f40..a3243d4d52a 100755 >--- a/opac/clubs/clubs-tab.pl >+++ b/opac/clubs/clubs-tab.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Patrons; > > my $cgi = CGI->new; >diff --git a/opac/clubs/enroll.pl b/opac/clubs/enroll.pl >index f486c7dfd28..a71990196fd 100755 >--- a/opac/clubs/enroll.pl >+++ b/opac/clubs/enroll.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Clubs; > > my $cgi = CGI->new; >diff --git a/opac/errors/400.pl b/opac/errors/400.pl >index e295c0bf292..b069697b17d 100755 >--- a/opac/errors/400.pl >+++ b/opac/errors/400.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/errors/401.pl b/opac/errors/401.pl >index 011698d5a6d..a4dbd1e63d4 100755 >--- a/opac/errors/401.pl >+++ b/opac/errors/401.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/errors/402.pl b/opac/errors/402.pl >index b3f94e69921..271afe0c9cd 100755 >--- a/opac/errors/402.pl >+++ b/opac/errors/402.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/errors/403.pl b/opac/errors/403.pl >index 2768a14945d..c305b9f92b5 100755 >--- a/opac/errors/403.pl >+++ b/opac/errors/403.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/errors/404.pl b/opac/errors/404.pl >index 6fe04c218bc..60128b72d4c 100755 >--- a/opac/errors/404.pl >+++ b/opac/errors/404.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/errors/500.pl b/opac/errors/500.pl >index be1e374fbef..f269ab29966 100755 >--- a/opac/errors/500.pl >+++ b/opac/errors/500.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > use List::MoreUtils qw(any); > >diff --git a/opac/ilsdi.pl b/opac/ilsdi.pl >index 1b785211ced..9b6c2fe67d0 100755 >--- a/opac/ilsdi.pl >+++ b/opac/ilsdi.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use C4::ILSDI::Services; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use List::MoreUtils qw(any); >diff --git a/opac/maintenance.pl b/opac/maintenance.pl >index 7ec3ec80932..c7924921c3d 100755 >--- a/opac/maintenance.pl >+++ b/opac/maintenance.pl >@@ -19,7 +19,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Auth; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Templates qw/gettemplate/; > > use Koha; >diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl >index d1076e76ef8..d43626b6b19 100755 >--- a/opac/opac-ISBDdetail.pl >+++ b/opac/opac-ISBDdetail.pl >@@ -41,16 +41,16 @@ the items attached to the biblio > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( parametrized_url output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( TransformMarcToKoha GetISBDView CountItemsIssued GetMarcControlnumber GetMarcISSN ); >+use C4::Items qw( sub ); > use C4::Reserves; > use C4::Acquisition; >-use C4::Serials; # uses getsubscriptionfrom biblionumber >-use C4::Koha; >+use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); >+use C4::Koha qw( GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN ); > use Koha::CirculationRules; > use Koha::ItemTypes; > use Koha::Patrons; >diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl >index 43622709596..a60012bec9e 100755 >--- a/opac/opac-MARCdetail.pl >+++ b/opac/opac-MARCdetail.pl >@@ -45,17 +45,17 @@ the items attached to the biblio > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( parametrized_url output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use MARC::Record; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( GetMarcBiblio GetMarcStructure GetMarcFromKohaField CountItemsIssued GetAuthorisedValueDesc TransformMarcToKoha GetMarcControlnumber GetMarcISSN ); >+use C4::Items qw( sub ); > use C4::Reserves; > use C4::Members; > use C4::Acquisition; >-use C4::Koha; >+use C4::Koha qw( display_marc_indicators GetNormalizedISBN ); > use List::MoreUtils qw( any uniq ); > use Koha::Biblios; > use Koha::CirculationRules; >diff --git a/opac/opac-account-pay-return.pl b/opac/opac-account-pay-return.pl >index 841f84fbde9..bdfbcfcb1a6 100755 >--- a/opac/opac-account-pay-return.pl >+++ b/opac/opac-account-pay-return.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI; > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use Koha::Plugins::Handler; > > my $cgi = CGI->new; >diff --git a/opac/opac-account-pay.pl b/opac/opac-account-pay.pl >index cdc4d42b598..445403fe061 100755 >--- a/opac/opac-account-pay.pl >+++ b/opac/opac-account-pay.pl >@@ -26,7 +26,7 @@ use HTTP::Request::Common; > use LWP::UserAgent; > use URI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use C4::Context; > use Koha::Acquisition::Currencies; >diff --git a/opac/opac-account.pl b/opac/opac-account.pl >index 3a7b4cb1c27..cc091cf3ddc 100755 >--- a/opac/opac-account.pl >+++ b/opac/opac-account.pl >@@ -22,8 +22,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Members; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Account::Lines; > use Koha::Patrons; > use Koha::Plugins; >diff --git a/opac/opac-addbybiblionumber.pl b/opac/opac-addbybiblionumber.pl >index 3563dfc300d..16f5eebfd42 100755 >--- a/opac/opac-addbybiblionumber.pl >+++ b/opac/opac-addbybiblionumber.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Biblio; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > > use Koha::Biblios; > use Koha::Virtualshelves; >diff --git a/opac/opac-alert-subscribe.pl b/opac/opac-alert-subscribe.pl >index 08226e5cb34..11f4cc53dd7 100755 >--- a/opac/opac-alert-subscribe.pl >+++ b/opac/opac-alert-subscribe.pl >@@ -20,12 +20,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Koha; > use C4::Letters; >-use C4::Serials; >+use C4::Serials qw( GetSubscription ); > > > my $query = CGI->new; >diff --git a/opac/opac-article-request-cancel.pl b/opac/opac-article-request-cancel.pl >index 11893f656dc..c55174f80fc 100755 >--- a/opac/opac-article-request-cancel.pl >+++ b/opac/opac-article-request-cancel.pl >@@ -22,7 +22,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use C4::Output; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use Koha::ArticleRequests; > > my $query = CGI->new; >diff --git a/opac/opac-authorities-home.pl b/opac/opac-authorities-home.pl >index 2b9488381f7..1155000a504 100755 >--- a/opac/opac-authorities-home.pl >+++ b/opac/opac-authorities-home.pl >@@ -22,12 +22,12 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use URI::Escape; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > > use C4::Context; >-use C4::Auth; >-use C4::Output; >-use C4::AuthoritiesMarc; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( pagination_bar output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Search::History; > >diff --git a/opac/opac-authoritiesdetail.pl b/opac/opac-authoritiesdetail.pl >index 952bef3cf94..83fb363050c 100755 >--- a/opac/opac-authoritiesdetail.pl >+++ b/opac/opac-authoritiesdetail.pl >@@ -38,14 +38,14 @@ parameters tables. > > use Modern::Perl; > >-use C4::AuthoritiesMarc; >-use C4::Auth; >-use C4::Biblio qw(GetMarcUrls); >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcUrls ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use MARC::Record; >-use C4::Koha; >+use C4::Koha qw( display_marc_indicators ); > > use Koha::Authorities; > use Koha::Authority::Types; >diff --git a/opac/opac-basket.pl b/opac/opac-basket.pl >index 2de55f4be64..6997a6bfda3 100755 >--- a/opac/opac-basket.pl >+++ b/opac/opac-basket.pl >@@ -20,11 +20,11 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use C4::Koha; >-use C4::Biblio; >-use C4::Items; >-use C4::Circulation; >-use C4::Auth; >-use C4::Output; >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetFrameworkCode GetMarcAuthors GetMarcSubjects GetMarcSeries GetMarcUrls ); >+use C4::Items qw( sub GetItemsInfo GetHiddenItemnumbers ); >+use C4::Circulation qw( GetTransfers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::RecordProcessor; > use Koha::CsvProfiles; > use Koha::AuthorisedValues; >diff --git a/opac/opac-blocked.pl b/opac/opac-blocked.pl >index 2876823c46e..6fc1a04aa11 100755 >--- a/opac/opac-blocked.pl >+++ b/opac/opac-blocked.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_with_http_headers ); > use C4::Context; > > my $query = CGI->new; >diff --git a/opac/opac-browse.pl b/opac/opac-browse.pl >index 84df8c83ed7..2ec62186b66 100755 >--- a/opac/opac-browse.pl >+++ b/opac/opac-browse.pl >@@ -22,9 +22,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::SearchEngine::Elasticsearch; > use Koha::SearchEngine::Elasticsearch::Browse; >diff --git a/opac/opac-browser.pl b/opac/opac-browser.pl >index 67851e90536..443c25ee19f 100755 >--- a/opac/opac-browser.pl >+++ b/opac/opac-browser.pl >@@ -26,9 +26,9 @@ TODO :: Description here > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Biblio; > >diff --git a/opac/opac-course-details.pl b/opac/opac-course-details.pl >index c7fe920b5ab..95915b4aa45 100755 >--- a/opac/opac-course-details.pl >+++ b/opac/opac-course-details.pl >@@ -22,11 +22,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > >-use C4::CourseReserves qw(GetCourse GetCourseReserves); >+use C4::CourseReserves qw( GetCourse GetCourseReserve GetCourseReserves ); > > my $cgi = CGI->new; > >diff --git a/opac/opac-course-reserves.pl b/opac/opac-course-reserves.pl >index f4cf89d7076..690e1d96418 100755 >--- a/opac/opac-course-reserves.pl >+++ b/opac/opac-course-reserves.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > >-use C4::CourseReserves qw(SearchCourses); >+use C4::CourseReserves qw( SearchCourses ); > > my $cgi = CGI->new; > >diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl >index 6173b728622..7d593759f6c 100755 >--- a/opac/opac-detail.pl >+++ b/opac/opac-detail.pl >@@ -24,30 +24,30 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Acquisition qw( SearchOrders ); >-use C4::Auth qw(:DEFAULT get_session); >-use C4::Koha; >-use C4::Serials; #uses getsubscriptionfrom biblionumber >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >-use C4::Circulation; >-use C4::Tags qw(get_tags); >-use C4::XISBN qw(get_xisbns); >+use C4::Auth qw( get_template_and_user get_session ); >+use C4::Koha qw( GetNormalizedEAN getitemtypeimagelocation GetNormalizedUPC GetNormalizedOCLCNumber GetNormalizedISBN ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber SearchSubscriptions GetLatestSerials ); >+use C4::Output qw( parametrized_url output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcBiblio GetBiblioData CountItemsIssued GetMarcISBN GetMarcAuthors GetMarcSubjects GetMarcSeries GetMarcUrls GetMarcControlnumber GetMarcISSN ); >+use C4::Items qw( GetItemsInfo GetHiddenItemnumbers sub ); >+use C4::Circulation qw( GetTransfers ); >+use C4::Tags qw( get_tags get_tag ); >+use C4::XISBN qw( get_xisbns ); > use C4::External::Amazon; > use C4::External::BakerTaylor qw( image_url link_url ); > use C4::External::Syndetics qw(get_syndetics_index get_syndetics_summary get_syndetics_toc get_syndetics_excerpt get_syndetics_reviews get_syndetics_anotes ); > use C4::Members; > use C4::XSLT; >-use C4::ShelfBrowser; >-use C4::Reserves; >-use C4::Charset; >+use C4::ShelfBrowser qw( GetNearbyItems ); >+use C4::Reserves qw( GetReserveStatus ); >+use C4::Charset qw( SetUTF8Flag ); > use C4::Letters; > use MARC::Record; > use MARC::Field; > use List::MoreUtils qw/any none/; > use Koha::DateUtils; > use C4::HTML5Media; >-use C4::CourseReserves qw(GetItemCourseReservesInfo); >+use C4::CourseReserves qw( GetItemCourseReservesInfo ); > > use Koha::Biblios; > use Koha::RecordProcessor; >diff --git a/opac/opac-discharge.pl b/opac/opac-discharge.pl >index 58141c64594..c773568e343 100755 >--- a/opac/opac-discharge.pl >+++ b/opac/opac-discharge.pl >@@ -20,10 +20,10 @@ > use Modern::Perl; > use Carp; > >-use C4::Auth qw(:DEFAULT get_session); >+use C4::Auth qw( get_template_and_user ); > use CGI qw( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Log; > use C4::Debug; > use Koha::Patrons; >diff --git a/opac/opac-downloadcart.pl b/opac/opac-downloadcart.pl >index 0fb7a02f3c2..1641627bb37 100755 >--- a/opac/opac-downloadcart.pl >+++ b/opac/opac-downloadcart.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode qw(encode); > >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode GetISBDView ); > use C4::Items; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Record; > use C4::Ris; > use Koha::CsvProfiles; >diff --git a/opac/opac-downloadshelf.pl b/opac/opac-downloadshelf.pl >index 99d14a73dae..9cf72399368 100755 >--- a/opac/opac-downloadshelf.pl >+++ b/opac/opac-downloadshelf.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode qw(encode); > >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode GetISBDView ); > use C4::Items; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Record; > use C4::Ris; > use Koha::CsvProfiles; >diff --git a/opac/opac-export.pl b/opac/opac-export.pl >index 82954d660f5..da71d5080a4 100755 >--- a/opac/opac-export.pl >+++ b/opac/opac-export.pl >@@ -22,7 +22,7 @@ use Modern::Perl; > use C4::Record; > use C4::Auth; > use C4::Output; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio GetMarcControlnumber GetFrameworkCode GetISBDView ); > use CGI qw ( -utf8 ); > use C4::Auth; > use C4::Ris; >diff --git a/opac/opac-holdshistory.pl b/opac/opac-holdshistory.pl >index 67ecae864ed..e869128a378 100755 >--- a/opac/opac-holdshistory.pl >+++ b/opac/opac-holdshistory.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Patrons; > use Koha::Holds; >diff --git a/opac/opac-ics.pl b/opac/opac-ics.pl >index bbb9b5bf40e..4cd1a6ac1ee 100755 >--- a/opac/opac-ics.pl >+++ b/opac/opac-ics.pl >@@ -29,7 +29,7 @@ use DateTime::Format::ICal; > use DateTime::Event::ICal; > use URI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Circulation; > use C4::Members; >diff --git a/opac/opac-idref.pl b/opac/opac-idref.pl >index 8b95311f7ee..47f3867e9ef 100755 >--- a/opac/opac-idref.pl >+++ b/opac/opac-idref.pl >@@ -25,10 +25,10 @@ use HTTP::Request::Common; > use JSON; > use Encode; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > my ( $template, $borrowernumber, $cookie ) = get_template_and_user( >diff --git a/opac/opac-illrequests.pl b/opac/opac-illrequests.pl >index 5881dedcc5c..e619707451e 100755 >--- a/opac/opac-illrequests.pl >+++ b/opac/opac-illrequests.pl >@@ -22,9 +22,9 @@ use Modern::Perl; > use JSON qw( encode_json ); > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Illrequest::Config; > use Koha::Illrequests; >diff --git a/opac/opac-imageviewer.pl b/opac/opac-imageviewer.pl >index 6daa63d8e0f..e133c93cc59 100755 >--- a/opac/opac-imageviewer.pl >+++ b/opac/opac-imageviewer.pl >@@ -20,9 +20,9 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Biblios; > use Koha::CoverImages; >diff --git a/opac/opac-issue-note.pl b/opac/opac-issue-note.pl >index 781a5326955..a8a49ac4277 100755 >--- a/opac/opac-issue-note.pl >+++ b/opac/opac-issue-note.pl >@@ -23,10 +23,10 @@ use CGI qw ( -utf8 ); > use C4::Koha; > use C4::Context; > use C4::Scrubber; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use Koha::Checkouts; > use Koha::DateUtils; > use Koha::Patrons; >diff --git a/opac/opac-library.pl b/opac/opac-library.pl >index 52168615f35..951d0b43ab9 100755 >--- a/opac/opac-library.pl >+++ b/opac/opac-library.pl >@@ -21,8 +21,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Libraries; > > my $query = CGI->new(); >diff --git a/opac/opac-main.pl b/opac/opac-main.pl >index af0377f4834..159f30fc006 100755 >--- a/opac/opac-main.pl >+++ b/opac/opac-main.pl >@@ -20,13 +20,13 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; # get_template_and_user >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::NewsChannels; # GetNewsToDisplay > use C4::Languages qw(getTranslatedLanguages accept_language); > use Koha::Quotes; > use C4::Members; >-use C4::Overdues; >+use C4::Overdues qw( checkoverdues ); > use Koha::Checkouts; > use Koha::Holds; > use Koha::News; >diff --git a/opac/opac-memberentry.pl b/opac/opac-memberentry.pl >index c9a4790efd3..ccc3b3c2395 100755 >--- a/opac/opac-memberentry.pl >+++ b/opac/opac-memberentry.pl >@@ -23,12 +23,12 @@ use JSON; > use List::MoreUtils qw( any each_array uniq ); > use String::Random qw( random_string ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Members; >+use C4::Members qw( get_cardnumber_length checkcardnumber ); > use C4::Form::MessagingPreferences; >-use Koha::AuthUtils; >+use Koha::AuthUtils qw( generate_password is_password_valid ); > use Koha::Patrons; > use Koha::Patron::Consent; > use Koha::Patron::Modification; >diff --git a/opac/opac-messaging.pl b/opac/opac-messaging.pl >index bb44b4c65e1..380117d324b 100755 >--- a/opac/opac-messaging.pl >+++ b/opac/opac-messaging.pl >@@ -21,11 +21,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; # checkauth, getborrowernumber. >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Koha; > use C4::Circulation; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use C4::Members::Messaging; > use C4::Form::MessagingPreferences; >diff --git a/opac/opac-modrequest-suspend.pl b/opac/opac-modrequest-suspend.pl >index ca95ddad396..ea18bc85534 100755 >--- a/opac/opac-modrequest-suspend.pl >+++ b/opac/opac-modrequest-suspend.pl >@@ -19,8 +19,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Output; >-use C4::Reserves; >-use C4::Auth; >+use C4::Reserves qw( CanReserveBeCanceledFromOpac ToggleSuspend SuspendAll ); >+use C4::Auth qw( get_template_and_user ); > my $query = CGI->new; > my ( $template, $borrowernumber, $cookie ) = get_template_and_user( > { >diff --git a/opac/opac-modrequest.pl b/opac/opac-modrequest.pl >index d63781b8f92..84b8758b86d 100755 >--- a/opac/opac-modrequest.pl >+++ b/opac/opac-modrequest.pl >@@ -26,8 +26,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Output; >-use C4::Reserves; >-use C4::Auth; >+use C4::Reserves qw( CanReserveBeCanceledFromOpac ); >+use C4::Auth qw( get_template_and_user ); > use Koha::Holds; > my $query = CGI->new; > >diff --git a/opac/opac-mymessages.pl b/opac/opac-mymessages.pl >index 8991c4e9981..75a6ba58694 100755 >--- a/opac/opac-mymessages.pl >+++ b/opac/opac-mymessages.pl >@@ -21,11 +21,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Koha; >-use C4::Letters; >-use C4::Output; >+use C4::Letters qw( GetRSSMessages ); >+use C4::Output qw( output_html_with_http_headers ); > > my $query = CGI->new(); > >diff --git a/opac/opac-news-rss.pl b/opac/opac-news-rss.pl >index f8c2b0e485e..7ba7501ba2c 100755 >--- a/opac/opac-news-rss.pl >+++ b/opac/opac-news-rss.pl >@@ -20,8 +20,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; # get_template_and_user >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::NewsChannels; # GetNewsToDisplay > use C4::Languages qw(getTranslatedLanguages accept_language); > >diff --git a/opac/opac-overdrive-search.pl b/opac/opac-overdrive-search.pl >index f61b22227e9..20d87436e1c 100755 >--- a/opac/opac-overdrive-search.pl >+++ b/opac/opac-overdrive-search.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(:DEFAULT get_session); >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > >diff --git a/opac/opac-passwd.pl b/opac/opac-passwd.pl >index f6ab65075a0..d0479d33a94 100755 >--- a/opac/opac-passwd.pl >+++ b/opac/opac-passwd.pl >@@ -22,11 +22,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; # checkauth, getborrowernumber. >+use C4::Auth qw( get_template_and_user checkpw checkpw_hash ); > use C4::Context; > use C4::Circulation; > use C4::Members; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Patrons; > > use Try::Tiny; >diff --git a/opac/opac-password-recovery.pl b/opac/opac-password-recovery.pl >index c0be4598d58..73a2496d15c 100755 >--- a/opac/opac-password-recovery.pl >+++ b/opac/opac-password-recovery.pl >@@ -3,9 +3,9 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use Koha::Patron::Password::Recovery > qw(SendPasswordRecoveryEmail ValidateBorrowernumber GetValidLinkInfo CompletePasswordRecovery DeleteExpiredPasswordRecovery); >diff --git a/opac/opac-patron-consent.pl b/opac/opac-patron-consent.pl >index 2de16abbe5b..362c4b7aab7 100755 >--- a/opac/opac-patron-consent.pl >+++ b/opac/opac-patron-consent.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI qw/-utf8/; > >-use C4::Auth qw/get_template_and_user/; >-use C4::Output qw/output_html_with_http_headers/; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::DateUtils qw/dt_from_string/; > use Koha::Patron::Consents; > use Koha::Patrons; >diff --git a/opac/opac-patron-image.pl b/opac/opac-patron-image.pl >index b40788db7ed..3f1efb8a47b 100755 >--- a/opac/opac-patron-image.pl >+++ b/opac/opac-patron-image.pl >@@ -22,7 +22,7 @@ use Modern::Perl; > use C4::Members; > use CGI qw ( -utf8 ); > use CGI::Cookie; # need to check cookies before having CGI parse the POST request >-use C4::Auth qw(:DEFAULT check_cookie_auth); >+use C4::Auth qw( check_cookie_auth ); > use Koha::Patron::Images; > > my $query = CGI->new; >diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl >index 2b0ed98dc33..3515cf37814 100755 >--- a/opac/opac-privacy.pl >+++ b/opac/opac-privacy.pl >@@ -19,9 +19,9 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; # checkauth, getborrowernumber. >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Patrons; > > my $query = CGI->new; >diff --git a/opac/opac-ratings-ajax.pl b/opac/opac-ratings-ajax.pl >index 8620368b533..70dfcd62c17 100755 >--- a/opac/opac-ratings-ajax.pl >+++ b/opac/opac-ratings-ajax.pl >@@ -28,10 +28,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use CGI::Cookie; # need to check cookies before having CGI parse the POST request > >-use C4::Auth qw(:DEFAULT check_cookie_auth); >+use C4::Auth qw( get_template_and_user check_cookie_auth ); > use C4::Context; > use C4::Debug; >-use C4::Output qw(:html :ajax pagination_bar); >+use C4::Output qw( is_ajax output_ajax_with_http_headers ); > > use Koha::Ratings; > >diff --git a/opac/opac-ratings.pl b/opac/opac-ratings.pl >index 38c50d6fd11..b6bf4eac36b 100755 >--- a/opac/opac-ratings.pl >+++ b/opac/opac-ratings.pl >@@ -28,7 +28,7 @@ note: there is currently no 'delete rating' functionality in this script > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Context; > use C4::Debug; > >diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl >index 77b591bb4e2..d385f07e36d 100755 >--- a/opac/opac-readingrecord.pl >+++ b/opac/opac-readingrecord.pl >@@ -20,17 +20,17 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Koha; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Koha qw( GetNormalizedISBN getitemtypeimagelocation GetNormalizedUPC ); >+use C4::Biblio qw( GetXmlBiblio ); > use C4::Circulation; >-use C4::Members; >+use C4::Members qw( GetAllIssues ); > use C4::External::BakerTaylor qw( image_url link_url ); > use Koha::DateUtils; > use MARC::Record; > >-use C4::Output; >-use C4::Charset qw(StripNonXmlChars); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Charset qw( StripNonXmlChars ); > use Koha::Patrons; > > use Koha::ItemTypes; >diff --git a/opac/opac-recordedbooks-search.pl b/opac/opac-recordedbooks-search.pl >index 1345080b855..9b6c5dca7b5 100755 >--- a/opac/opac-recordedbooks-search.pl >+++ b/opac/opac-recordedbooks-search.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > >diff --git a/opac/opac-registration-verify.pl b/opac/opac-registration-verify.pl >index 71ea3292518..7574f7fa79d 100755 >--- a/opac/opac-registration-verify.pl >+++ b/opac/opac-registration-verify.pl >@@ -19,11 +19,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use C4::Form::MessagingPreferences; >-use Koha::AuthUtils; >+use Koha::AuthUtils qw( generate_password ); > use Koha::Patrons; > use Koha::Patron::Consent; > use Koha::Patron::Modifications; >diff --git a/opac/opac-renew.pl b/opac/opac-renew.pl >index ea8dbde961a..12c14c9449a 100755 >--- a/opac/opac-renew.pl >+++ b/opac/opac-renew.pl >@@ -24,8 +24,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Circulation; >-use C4::Auth; >+use C4::Circulation qw( CanBookBeRenewed AddRenewal ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Items; > use C4::Members; >diff --git a/opac/opac-reportproblem.pl b/opac/opac-reportproblem.pl >index 293f2826c08..9b03c135fee 100755 >--- a/opac/opac-reportproblem.pl >+++ b/opac/opac-reportproblem.pl >@@ -21,9 +21,9 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Try::Tiny; > >-use C4::Auth; # get_template_and_user >-use C4::Output; >-use C4::Letters; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use Koha::ProblemReport; > use Koha::Libraries; > use Koha::Patrons; >diff --git a/opac/opac-request-article.pl b/opac/opac-request-article.pl >index d6ce08f8add..c3ef2ae37b7 100755 >--- a/opac/opac-request-article.pl >+++ b/opac/opac-request-article.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Biblios; > use Koha::Patrons; >diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl >index a6182400ada..4fb06bd434f 100755 >--- a/opac/opac-reserve.pl >+++ b/opac/opac-reserve.pl >@@ -21,13 +21,13 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; # checkauth, getborrowernumber. >-use C4::Koha; >-use C4::Circulation; >-use C4::Reserves; >-use C4::Biblio; >-use C4::Items; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Koha qw( getitemtypeimagesrc getitemtypeimagelocation ); >+use C4::Circulation qw( GetBranchItemRule GetTransfers ); >+use C4::Reserves qw( CanItemBeReserved CanBookBeReserved AddReserve GetReservesControlBranch IsAvailableForItemLevelRequest ); >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetFrameworkCode ); >+use C4::Items qw( GetItemsInfo GetHostItemsInfo sub ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Members; > use C4::Overdues; >diff --git a/opac/opac-restrictedpage.pl b/opac/opac-restrictedpage.pl >index e9a325a2f2f..3270f99e8e6 100755 >--- a/opac/opac-restrictedpage.pl >+++ b/opac/opac-restrictedpage.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $localNetwork = C4::Context->preference('RestrictedPageLocalIPs'); > my $userIP = $ENV{'REMOTE_ADDR'}; >diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl >index d19f9dd7380..3f6e6c8d3be 100755 >--- a/opac/opac-retrieve-file.pl >+++ b/opac/opac-retrieve-file.pl >@@ -21,9 +21,9 @@ use Modern::Perl; > use CGI; > use Encode; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::UploadedFiles; > > my $input = CGI::->new; >diff --git a/opac/opac-review.pl b/opac/opac-review.pl >index 9c277633848..6f3763ca1ea 100755 >--- a/opac/opac-review.pl >+++ b/opac/opac-review.pl >@@ -19,9 +19,9 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; > use C4::Scrubber; > use C4::Debug; >diff --git a/opac/opac-routing-lists.pl b/opac/opac-routing-lists.pl >index 6982c1657df..5412e207d8d 100755 >--- a/opac/opac-routing-lists.pl >+++ b/opac/opac-routing-lists.pl >@@ -19,8 +19,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Members; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Patrons; > > my $query = CGI->new; >diff --git a/opac/opac-search-history.pl b/opac/opac-search-history.pl >index a9a4a73cea1..d36ef99d76b 100755 >--- a/opac/opac-search-history.pl >+++ b/opac/opac-search-history.pl >@@ -19,10 +19,10 @@ > > use Modern::Perl; > >-use C4::Auth qw(:DEFAULT get_session); >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Log; > use C4::Items; > use C4::Debug; >diff --git a/opac/opac-search.pl b/opac/opac-search.pl >index 878d97826f6..225419bbe83 100755 >--- a/opac/opac-search.pl >+++ b/opac/opac-search.pl >@@ -43,14 +43,14 @@ my ($builder, $searcher); > $builder = Koha::SearchEngine::QueryBuilder->new({index => 'biblios'}); > $searcher = Koha::SearchEngine::Search->new({index => 'biblios'}); > >-use C4::Output; >-use C4::Auth qw(:DEFAULT get_session); >-use C4::Languages qw(getLanguages); >-use C4::Search; >-use C4::Search::History; >-use C4::Biblio; # Unused here? >-use C4::Koha; >-use C4::Tags qw(get_tags); >+use C4::Output qw( output_html_with_http_headers pagination_bar output_with_http_headers ); >+use C4::Auth qw( get_template_and_user get_session ); >+use C4::Languages qw( getlanguage getLanguages ); >+use C4::Search qw( searchResults ); >+use C4::Search qw( searchResults ); >+use C4::Biblio qw( GetXmlBiblio CountItemsIssued ); >+use C4::Koha qw( GetItemTypesCategorized getitemtypeimagelocation GetAuthorisedValues ); >+use C4::Tags qw( get_tags get_tag ); > use C4::SocialData; > use C4::External::OverDrive; > use C4::External::BakerTaylor qw( image_url link_url ); >diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl >index eee5e2c29be..8fdfa96f610 100755 >--- a/opac/opac-sendbasket.pl >+++ b/opac/opac-sendbasket.pl >@@ -24,10 +24,10 @@ use Encode qw(encode); > use Carp; > use Try::Tiny; > >-use C4::Biblio; >-use C4::Items; >-use C4::Auth; >-use C4::Output; >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetMarcAuthors GetMarcSubjects ); >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use C4::Templates (); > use Koha::Email; >diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl >index c97aa450dc9..58b68420fac 100755 >--- a/opac/opac-sendshelf.pl >+++ b/opac/opac-sendshelf.pl >@@ -24,10 +24,10 @@ use Encode qw( encode ); > use Carp; > use Try::Tiny; > >-use C4::Auth; >-use C4::Biblio; >-use C4::Items; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio GetFrameworkCode GetBiblioData GetMarcAuthors GetMarcSubjects GetMarcISBN ); >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use Koha::Email; > use Koha::Patrons; >diff --git a/opac/opac-serial-issues.pl b/opac/opac-serial-issues.pl >index 74e5abbc555..3167ba91a23 100755 >--- a/opac/opac-serial-issues.pl >+++ b/opac/opac-serial-issues.pl >@@ -21,11 +21,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Serials; >+use C4::Serials qw( GetFullSubscription GetFullSubscriptionsFromBiblionumber PrepareSerialsData GetSubscription GetSubscriptionsFromBiblionumber ); > use C4::Letters; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > my $query = CGI->new; >diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl >index 7eecf6c45f3..bff02910efc 100755 >--- a/opac/opac-shareshelf.pl >+++ b/opac/opac-shareshelf.pl >@@ -27,11 +27,11 @@ use constant SHELVES_URL => > use CGI qw ( -utf8 ); > use Email::Valid; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( GetPreparedLetter EnqueueLetter ); > use C4::Members (); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Patrons; > use Koha::Virtualshelves; >diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl >index b94b4126ea5..d19efb9e79b 100755 >--- a/opac/opac-shelves.pl >+++ b/opac/opac-shelves.pl >@@ -20,14 +20,14 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetFrameworkCode ); > use C4::External::BakerTaylor qw( image_url link_url ); >-use C4::Koha; >-use C4::Items; >+use C4::Koha qw( getitemtypeimagelocation GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN ); >+use C4::Items qw( GetItemsLocationInfo ); > use C4::Members; >-use C4::Output; >-use C4::Tags qw( get_tags ); >+use C4::Output qw( pagination_bar output_with_http_headers ); >+use C4::Tags qw( get_tags get_tag ); > use C4::XSLT; > > use Koha::Biblios; >diff --git a/opac/opac-showmarc.pl b/opac/opac-showmarc.pl >index a30e3e5fdd9..69074dc392d 100755 >--- a/opac/opac-showmarc.pl >+++ b/opac/opac-showmarc.pl >@@ -25,8 +25,8 @@ use Encode; > > # Koha modules used > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; > use C4::ImportBatch; > use C4::XSLT (); >diff --git a/opac/opac-showreviews.pl b/opac/opac-showreviews.pl >index cfb359c6b78..cc25c27247b 100755 >--- a/opac/opac-showreviews.pl >+++ b/opac/opac-showreviews.pl >@@ -21,11 +21,11 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Koha; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Koha qw( GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Circulation; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcBiblio ); > use Koha::DateUtils; > use Koha::Patrons; > use Koha::Reviews; >diff --git a/opac/opac-suggestions.pl b/opac/opac-suggestions.pl >index b1f1701ddc5..ada516cf252 100755 >--- a/opac/opac-suggestions.pl >+++ b/opac/opac-suggestions.pl >@@ -20,12 +20,12 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use Encode qw( encode ); >-use C4::Auth; # get_template_and_user >+use C4::Auth qw( get_template_and_user ); > use C4::Members; >-use C4::Koha; >-use C4::Output; >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Suggestions; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Scrubber; > use C4::Search qw( FindDuplicate ); > >diff --git a/opac/opac-tags.pl b/opac/opac-tags.pl >index 05a4c1a74ae..ed8cf5f2e72 100755 >--- a/opac/opac-tags.pl >+++ b/opac/opac-tags.pl >@@ -35,14 +35,14 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use CGI::Cookie; # need to check cookies before having CGI parse the POST request > >-use C4::Auth qw(:DEFAULT check_cookie_auth); >+use C4::Auth qw( check_cookie_auth get_template_and_user ); > use C4::Context; > use C4::Debug; >-use C4::Output qw(:html :ajax ); >+use C4::Output qw( output_with_http_headers is_ajax output_html_with_http_headers ); > use C4::Scrubber; >-use C4::Biblio; >-use C4::Items qw(GetItemsInfo GetHiddenItemnumbers); >-use C4::Tags qw(add_tag get_approval_rows get_tag_rows remove_tag stratify_tags); >+use C4::Biblio qw( GetMarcBiblio ); >+use C4::Items qw( sub GetItemsInfo GetHiddenItemnumbers ); >+use C4::Tags qw( add_tag remove_tag get_tag_rows get_tag get_approval_rows stratify_tags ); > use C4::XSLT; > > use Data::Dumper; >diff --git a/opac/opac-tags_subject.pl b/opac/opac-tags_subject.pl >index 3c55c467d51..9cc4d1af579 100755 >--- a/opac/opac-tags_subject.pl >+++ b/opac/opac-tags_subject.pl >@@ -26,9 +26,9 @@ TODO :: Description here > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Biblio; > >diff --git a/opac/opac-topissues.pl b/opac/opac-topissues.pl >index 1f6edaef76d..4c0b2e934f1 100755 >--- a/opac/opac-topissues.pl >+++ b/opac/opac-topissues.pl >@@ -22,13 +22,13 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Languages; > use C4::Search; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; >-use C4::Circulation; >+use C4::Circulation qw( GetTopIssues ); > use Date::Manip; > > =head1 NAME >diff --git a/opac/opac-user.pl b/opac/opac-user.pl >index 7a9c774d67a..421012a32b9 100755 >--- a/opac/opac-user.pl >+++ b/opac/opac-user.pl >@@ -21,14 +21,14 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Koha; >-use C4::Circulation; >+use C4::Auth qw( get_template_and_user ); >+use C4::Koha qw( getitemtypeimagelocation GetNormalizedISBN GetNormalizedUPC ); >+use C4::Circulation qw( CanBookBeRenewed GetRenewCount GetIssuingCharges GetSoonestRenewDate ); > use C4::External::BakerTaylor qw( image_url link_url ); >-use C4::Reserves; >+use C4::Reserves qw( GetReserveStatus ); > use C4::Members; >-use C4::Output; >-use C4::Biblio; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcBiblio ); > use C4::Items; > use C4::Letters; > use Koha::Account::Lines; >diff --git a/opac/sci/sci-main.pl b/opac/sci/sci-main.pl >index 88a3cf8ce1d..aeafc7ff236 100755 >--- a/opac/sci/sci-main.pl >+++ b/opac/sci/sci-main.pl >@@ -19,9 +19,9 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user checkpw); >-use C4::Circulation; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Circulation qw( AddReturn ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Items; > > use List::MoreUtils qw( uniq ); >diff --git a/opac/sco/help.pl b/opac/sco/help.pl >index 22fb99a2d09..3d0e2aa36fb 100755 >--- a/opac/sco/help.pl >+++ b/opac/sco/help.pl >@@ -24,8 +24,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user in_iprange); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( in_iprange get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $query = CGI->new; > unless ( in_iprange(C4::Context->preference('SelfCheckAllowByIPRanges')) ) { >diff --git a/opac/sco/printslip.pl b/opac/sco/printslip.pl >index 3b7074194e6..e130202a8bf 100755 >--- a/opac/sco/printslip.pl >+++ b/opac/sco/printslip.pl >@@ -29,9 +29,9 @@ It is called from sco-main.pl > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Auth qw/:DEFAULT get_session in_iprange/; >-use C4::Output; >-use C4::Members; >+use C4::Auth qw( in_iprange get_session get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Members qw( IssueSlip ); > use C4::Koha; > > my $input = CGI->new; >diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl >index 742f7f43ca1..015dcf9012c 100755 >--- a/opac/sco/sco-main.pl >+++ b/opac/sco/sco-main.pl >@@ -35,11 +35,11 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user checkpw in_iprange); >+use C4::Auth qw( in_iprange get_template_and_user checkpw ); > use C4::Koha; >-use C4::Circulation; >+use C4::Circulation qw( AddReturn CanBookBeIssued AddIssue CanBookBeRenewed AddRenewal ); > use C4::Reserves; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use C4::Biblio; > use C4::Items; >diff --git a/opac/sco/sco-patron-image.pl b/opac/sco/sco-patron-image.pl >index e997ab984bf..36e86b7d137 100755 >--- a/opac/sco/sco-patron-image.pl >+++ b/opac/sco/sco-patron-image.pl >@@ -18,7 +18,7 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth qw(in_iprange); >+use C4::Auth qw( in_iprange ); > use C4::Service; > use C4::Members; > use Koha::Patron::Images; >diff --git a/opac/svc/shelfbrowser.pl b/opac/svc/shelfbrowser.pl >index 82e583ca81e..d9797c2e4ee 100755 >--- a/opac/svc/shelfbrowser.pl >+++ b/opac/svc/shelfbrowser.pl >@@ -3,10 +3,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::ShelfBrowser; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::ShelfBrowser qw( GetNearbyItems ); > > my $cgi = CGI->new; > >diff --git a/opac/tracklinks.pl b/opac/tracklinks.pl >index e357f0a1dfc..f854ca87bb1 100755 >--- a/opac/tracklinks.pl >+++ b/opac/tracklinks.pl >@@ -20,9 +20,9 @@ > > use Modern::Perl; > use C4::Context; >-use C4::Auth qw(checkauth); >-use C4::Biblio; >-use C4::Output; >+use C4::Auth qw( checkauth ); >+use C4::Biblio qw( GetMarcBiblio GetMarcUrls ); >+use C4::Output qw( output_error ); > use Koha::Items; > use Koha::Linktracker; > use CGI qw ( -utf8 ); >diff --git a/patron_lists/add-modify.pl b/patron_lists/add-modify.pl >index c10c2084478..3d5f92bce9c 100755 >--- a/patron_lists/add-modify.pl >+++ b/patron_lists/add-modify.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::List::Patron; > > my $cgi = CGI->new; >diff --git a/patron_lists/delete.pl b/patron_lists/delete.pl >index 87c199b4268..948f92aed8c 100755 >--- a/patron_lists/delete.pl >+++ b/patron_lists/delete.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use Koha::List::Patron; > >diff --git a/patron_lists/list.pl b/patron_lists/list.pl >index 75f30e29890..3796355dba1 100755 >--- a/patron_lists/list.pl >+++ b/patron_lists/list.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::List::Patron; > use List::MoreUtils qw/uniq/; > >diff --git a/patron_lists/lists.pl b/patron_lists/lists.pl >index df84727426b..aa8b878a6fd 100755 >--- a/patron_lists/lists.pl >+++ b/patron_lists/lists.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::List::Patron; > > my $cgi = CGI->new; >diff --git a/patron_lists/patrons.pl b/patron_lists/patrons.pl >index 98ac9593c28..145c24e3def 100755 >--- a/patron_lists/patrons.pl >+++ b/patron_lists/patrons.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::List::Patron; > > my $cgi = CGI->new; >diff --git a/patroncards/add_user_search.pl b/patroncards/add_user_search.pl >index 8eb2a731e9b..04bc0eb5b39 100755 >--- a/patroncards/add_user_search.pl >+++ b/patroncards/add_user_search.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/patroncards/create-pdf.pl b/patroncards/create-pdf.pl >index 1ffaa0002a9..bde50b96798 100755 >--- a/patroncards/create-pdf.pl >+++ b/patroncards/create-pdf.pl >@@ -19,7 +19,7 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use Graphics::Magick; > use XML::Simple; > use POSIX qw(ceil); >diff --git a/patroncards/edit-batch.pl b/patroncards/edit-batch.pl >index e00b01144b4..c7d57fd0b30 100755 >--- a/patroncards/edit-batch.pl >+++ b/patroncards/edit-batch.pl >@@ -25,8 +25,8 @@ use vars qw($debug); > use CGI qw ( -utf8 ); > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Patroncards; > use Koha::Patrons; >diff --git a/patroncards/edit-layout.pl b/patroncards/edit-layout.pl >index b50c221c026..301550ed1a0 100755 >--- a/patroncards/edit-layout.pl >+++ b/patroncards/edit-layout.pl >@@ -25,8 +25,8 @@ use Text::CSV_XS; > use XML::Simple; > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Patroncards; > >diff --git a/patroncards/edit-profile.pl b/patroncards/edit-profile.pl >index 7ca0e701171..dced7fc47d1 100755 >--- a/patroncards/edit-profile.pl >+++ b/patroncards/edit-profile.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators::Lib qw(get_all_templates get_unit_values); > use C4::Patroncards::Profile; > >diff --git a/patroncards/edit-template.pl b/patroncards/edit-template.pl >index 6ec791a2235..163e772fb76 100755 >--- a/patroncards/edit-template.pl >+++ b/patroncards/edit-template.pl >@@ -23,8 +23,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Patroncards; > >diff --git a/patroncards/home.pl b/patroncards/home.pl >index 884f4874d95..9fb02799120 100755 >--- a/patroncards/home.pl >+++ b/patroncards/home.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >diff --git a/patroncards/image-manage.pl b/patroncards/image-manage.pl >index 388f2af6882..75fcef254f1 100755 >--- a/patroncards/image-manage.pl >+++ b/patroncards/image-manage.pl >@@ -7,8 +7,8 @@ use Graphics::Magick; > use POSIX qw(ceil); > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Debug; > use C4::Creators; > use C4::Patroncards; >diff --git a/patroncards/manage.pl b/patroncards/manage.pl >index 62d0ee78a57..1333926789b 100755 >--- a/patroncards/manage.pl >+++ b/patroncards/manage.pl >@@ -24,8 +24,8 @@ use vars qw($debug); > use CGI qw ( -utf8 ); > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Patroncards; > use C4::Labels; >diff --git a/patroncards/print.pl b/patroncards/print.pl >index 03382824e25..6bafdadeef0 100755 >--- a/patroncards/print.pl >+++ b/patroncards/print.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth qw(get_template_and_user); >-use C4::Output qw(output_html_with_http_headers); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Creators; > use C4::Patroncards; > >diff --git a/plugins/plugins-enable.pl b/plugins/plugins-enable.pl >index 181550781aa..6966be9d23c 100755 >--- a/plugins/plugins-enable.pl >+++ b/plugins/plugins-enable.pl >@@ -20,7 +20,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use C4::Context; >-use C4::Auth qw(check_cookie_auth); >+use C4::Auth qw( check_cookie_auth ); > use Koha::Plugins::Handler; > > die("Koha plugins are disabled!") unless C4::Context->config("enable_plugins"); >diff --git a/plugins/plugins-home.pl b/plugins/plugins-home.pl >index f9d72b885d6..433bb238759 100755 >--- a/plugins/plugins-home.pl >+++ b/plugins/plugins-home.pl >@@ -25,8 +25,8 @@ use JSON qw(from_json); > use LWP::Simple qw(get); > > use Koha::Plugins; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Debug; > use C4::Context; > >diff --git a/plugins/plugins-uninstall.pl b/plugins/plugins-uninstall.pl >index 8f933a29713..ab1d402a8fa 100755 >--- a/plugins/plugins-uninstall.pl >+++ b/plugins/plugins-uninstall.pl >@@ -23,7 +23,7 @@ use File::Copy; > use CGI qw ( -utf8 ); > > use C4::Context; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Output; > use C4::Members; > use C4::Debug; >diff --git a/plugins/plugins-upload.pl b/plugins/plugins-upload.pl >index c81e6f175bd..3bb8751d0dc 100755 >--- a/plugins/plugins-upload.pl >+++ b/plugins/plugins-upload.pl >@@ -25,8 +25,8 @@ use File::Copy; > use File::Temp; > > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > use C4::Debug; > use Koha::Plugins; >diff --git a/plugins/run.pl b/plugins/run.pl >index d050f47d692..3e07f5f11f8 100755 >--- a/plugins/run.pl >+++ b/plugins/run.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > > use Koha::Plugins::Handler; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Debug; > use C4::Context; > >diff --git a/pos/pay.pl b/pos/pay.pl >index c83405321e2..b401f124958 100755 >--- a/pos/pay.pl >+++ b/pos/pay.pl >@@ -22,8 +22,8 @@ use Modern::Perl; > use CGI; > use JSON qw( from_json ); > >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >+use C4::Auth qw( get_session get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use Koha::Account::DebitTypes; >diff --git a/pos/printreceipt.pl b/pos/printreceipt.pl >index 14e4b72484b..5e0f7f78958 100755 >--- a/pos/printreceipt.pl >+++ b/pos/printreceipt.pl >@@ -19,10 +19,10 @@ > > use Modern::Perl; > >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit_if_error output_and_exit output_html_with_http_headers ); > use CGI qw ( -utf8 ); >-use C4::Letters; >+use C4::Letters qw( getletter ); > use Koha::Account::Lines; > use Koha::DateUtils; > >diff --git a/pos/register.pl b/pos/register.pl >index e398bda396f..a4275caa889 100755 >--- a/pos/register.pl >+++ b/pos/register.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use Koha::Account::Lines; >diff --git a/pos/registers.pl b/pos/registers.pl >index 44c81363fb9..7a9c3a16996 100755 >--- a/pos/registers.pl >+++ b/pos/registers.pl >@@ -19,8 +19,8 @@ > > use Modern::Perl; > use CGI; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > use Koha::Cash::Registers; >diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl >index b560e459a4c..6e46298ad78 100755 >--- a/reports/acquisitions_stats.pl >+++ b/reports/acquisitions_stats.pl >@@ -19,14 +19,14 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Reports; >-use C4::Output; >-use C4::Koha; >+use C4::Reports qw( GetDelimiterChoices ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Circulation; >-use C4::Biblio; >+use C4::Biblio qw( GetMarcSubfieldStructure GetMarcSubfieldStructureFromKohaField ); > use Koha::ItemTypes; > use Koha::DateUtils; > use Koha::Libraries; >diff --git a/reports/bor_issues_top.pl b/reports/bor_issues_top.pl >index 265362bb0d1..adbead8709a 100755 >--- a/reports/bor_issues_top.pl >+++ b/reports/bor_issues_top.pl >@@ -20,13 +20,13 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use C4::Koha; > use C4::Circulation; > use C4::Members; >-use C4::Reports; >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Debug; > > use Koha::DateUtils; >diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl >index aee373ad3cb..703da3ddb7d 100755 >--- a/reports/borrowers_out.pl >+++ b/reports/borrowers_out.pl >@@ -20,12 +20,12 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Circulation; >-use C4::Reports; >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Members; > > use Koha::DateUtils; >diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl >index c53491a070f..25dd3f000bd 100755 >--- a/reports/borrowers_stats.pl >+++ b/reports/borrowers_stats.pl >@@ -21,12 +21,12 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use List::MoreUtils qw/uniq/; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Acquisition; >-use C4::Output; >-use C4::Reports; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Circulation; > > use Koha::AuthorisedValues; >diff --git a/reports/cash_register_stats.pl b/reports/cash_register_stats.pl >index a59fcdb5f7e..a2e7cd80bd0 100755 >--- a/reports/cash_register_stats.pl >+++ b/reports/cash_register_stats.pl >@@ -16,11 +16,11 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI; > use C4::Context; >-use C4::Reports; >-use C4::Output; >+use C4::Reports qw( GetDelimiterChoices ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use C4::Circulation; > use DateTime; >diff --git a/reports/cat_issues_top.pl b/reports/cat_issues_top.pl >index ee0c092c439..d52012e4ae3 100755 >--- a/reports/cat_issues_top.pl >+++ b/reports/cat_issues_top.pl >@@ -19,13 +19,13 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Koha; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Circulation; >-use C4::Reports; >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Members; > use Koha::DateUtils; > use Koha::ItemTypes; >diff --git a/reports/catalogue_out.pl b/reports/catalogue_out.pl >index bea7fe9bf2f..bb721005597 100755 >--- a/reports/catalogue_out.pl >+++ b/reports/catalogue_out.pl >@@ -20,10 +20,10 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Debug; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > # use Date::Manip; # TODO: add not borrowed since date X criteria > use Data::Dumper; > >diff --git a/reports/catalogue_stats.pl b/reports/catalogue_stats.pl >index 85293b7026a..d6ca4b63b63 100755 >--- a/reports/catalogue_stats.pl >+++ b/reports/catalogue_stats.pl >@@ -19,14 +19,14 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Koha; >-use C4::Reports; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Circulation; >-use C4::Biblio qw/GetMarcSubfieldStructureFromKohaField/; >+use C4::Biblio qw( GetMarcSubfieldStructure GetMarcSubfieldStructureFromKohaField ); > > use Koha::AuthorisedValues; > use Koha::DateUtils; >diff --git a/reports/dictionary.pl b/reports/dictionary.pl >index 9cc7ed76972..93f4294effe 100755 >--- a/reports/dictionary.pl >+++ b/reports/dictionary.pl >@@ -18,10 +18,10 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > use CGI::Carp qw(fatalsToBrowser warningsToBrowser); > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); >-use C4::Output; >-use C4::Reports::Guided; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reports::Guided qw( get_from_dictionary get_columns get_column_type get_distinct_values save_dictionary delete_definition get_report_areas ); > use Koha::DateUtils; > > =head1 NAME >diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl >index 49dfc95a3e0..46c0d8591fe 100755 >--- a/reports/guided_reports.pl >+++ b/reports/guided_reports.pl >@@ -23,10 +23,10 @@ use Text::CSV::Encoded; > use Encode qw( decode ); > use URI::Escape; > use File::Temp; >-use C4::Reports::Guided; >+use C4::Reports::Guided qw( delete_report get_report_areas convert_sql update_sql get_saved_reports get_results ValidateSQLParameters format_results get_report_types get_columns get_from_dictionary get_criteria build_query save_report execute_query nb_rows get_report_groups ); > use Koha::Reports; >-use C4::Auth qw/:DEFAULT get_session/; >-use C4::Output; >+use C4::Auth qw( get_template_and_user get_session ); >+use C4::Output qw( pagination_bar output_html_with_http_headers ); > use C4::Debug; > use C4::Context; > use Koha::Caches; >diff --git a/reports/issues_avg_stats.pl b/reports/issues_avg_stats.pl >index 7e7406af38e..b95b72e4bc6 100755 >--- a/reports/issues_avg_stats.pl >+++ b/reports/issues_avg_stats.pl >@@ -19,13 +19,13 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use C4::Circulation; >-use C4::Reports; >+use C4::Reports qw( GetDelimiterChoices ); > use Koha::DateUtils; > use Koha::ItemTypes; > use Koha::Patron::Categories; >diff --git a/reports/issues_stats.pl b/reports/issues_stats.pl >index 896b4434789..da9a6e730b2 100755 >--- a/reports/issues_stats.pl >+++ b/reports/issues_stats.pl >@@ -22,13 +22,13 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Date::Manip; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use C4::Context; >-use C4::Koha; >-use C4::Output; >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Circulation; >-use C4::Reports; >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Members; > > use Koha::AuthorisedValues; >diff --git a/reports/itemslost.pl b/reports/itemslost.pl >index 3fcb75d6327..d15abaec025 100755 >--- a/reports/itemslost.pl >+++ b/reports/itemslost.pl >@@ -29,8 +29,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use Text::CSV_XS; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; > use C4::Items; > >diff --git a/reports/manager.pl b/reports/manager.pl >index 45f2d60ac57..6b43c19d387 100755 >--- a/reports/manager.pl >+++ b/reports/manager.pl >@@ -19,9 +19,9 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Circulation; > > >diff --git a/reports/orders_by_fund.pl b/reports/orders_by_fund.pl >index 6ffe018c9a9..ceb53b7d46d 100755 >--- a/reports/orders_by_fund.pl >+++ b/reports/orders_by_fund.pl >@@ -28,8 +28,8 @@ This script displays all orders associated to a selected budget. > use Modern::Perl; > > use CGI qw( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Budgets; > use C4::Biblio; > use C4::Reports; >diff --git a/reports/reports-home.pl b/reports/reports-home.pl >index 78978c19fdf..4ae2d8a6fdb 100755 >--- a/reports/reports-home.pl >+++ b/reports/reports-home.pl >@@ -20,8 +20,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > > >diff --git a/reports/reserves_stats.pl b/reports/reserves_stats.pl >index c28c398a322..022eabfa30c 100755 >--- a/reports/reserves_stats.pl >+++ b/reports/reserves_stats.pl >@@ -21,12 +21,12 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Debug; > use C4::Context; >-use C4::Koha; >-use C4::Output; >-use C4::Reports; >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Reports qw( GetDelimiterChoices ); > use C4::Members; > use Koha::AuthorisedValues; > use Koha::DateUtils; >diff --git a/reports/serials_stats.pl b/reports/serials_stats.pl >index 9a0a071ff7a..77dda2998c3 100755 >--- a/reports/serials_stats.pl >+++ b/reports/serials_stats.pl >@@ -18,13 +18,13 @@ > # along with Koha; if not, see <http://www.gnu.org/licenses>. > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; >-use C4::Reports; >-use C4::Serials; >+use C4::Reports qw( GetDelimiterChoices ); >+use C4::Serials qw( GetExpirationDate HasSubscriptionExpired ); > > =head1 serials_out > >diff --git a/reserve/modrequest.pl b/reserve/modrequest.pl >index b2d138378a6..976bff7a078 100755 >--- a/reserve/modrequest.pl >+++ b/reserve/modrequest.pl >@@ -26,8 +26,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use List::MoreUtils qw( uniq ); > use C4::Output; >-use C4::Reserves; >-use C4::Auth; >+use C4::Reserves qw( ModReserve ModReserveCancelAll ); >+use C4::Auth qw( get_template_and_user ); > use Koha::DateUtils qw( dt_from_string ); > > my $query = CGI->new; >diff --git a/reserve/modrequest_suspendall.pl b/reserve/modrequest_suspendall.pl >index dbe6b227db9..40681118837 100755 >--- a/reserve/modrequest_suspendall.pl >+++ b/reserve/modrequest_suspendall.pl >@@ -25,8 +25,8 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Output; >-use C4::Reserves; >-use C4::Auth; >+use C4::Reserves qw( SuspendAll ); >+use C4::Auth qw( get_template_and_user ); > > my $query = CGI->new; > my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >diff --git a/reserve/placerequest.pl b/reserve/placerequest.pl >index 05b5c7f3c94..d310e4ea0df 100755 >--- a/reserve/placerequest.pl >+++ b/reserve/placerequest.pl >@@ -27,10 +27,10 @@ use CGI qw ( -utf8 ); > use C4::Biblio; > use C4::Items; > use C4::Output; >-use C4::Reserves; >+use C4::Reserves qw( CanItemBeReserved AddReserve CanBookBeReserved ); > use C4::Circulation; > use C4::Members; >-use C4::Auth qw/checkauth/; >+use C4::Auth qw( checkauth ); > > use Koha::Items; > use Koha::Patrons; >diff --git a/reserve/request.pl b/reserve/request.pl >index 7637692c998..fe745f6d614 100755 >--- a/reserve/request.pl >+++ b/reserve/request.pl >@@ -31,18 +31,18 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use List::MoreUtils qw/uniq/; > use Date::Calc qw/Date_to_Days/; >-use C4::Output; >-use C4::Auth; >-use C4::Reserves; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Reserves qw( RevertWaitingStatus AlterPriority ToggleLowestPriority ToggleSuspend CanBookBeReserved GetMaxPatronHoldsForRecord ItemsAnyAvailableAndNotRestricted GetReservesControlBranch CanItemBeReserved IsAvailableForItemLevelRequest ); > use C4::Biblio; >-use C4::Items; >-use C4::Koha; >-use C4::Serials; >-use C4::Circulation; >+use C4::Items qw( get_hostitemnumbers_of sub ); >+use C4::Koha qw( getitemtypeimagelocation ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); >+use C4::Circulation qw( GetTransfers _GetCircControlBranch GetBranchItemRule ); > use Koha::DateUtils; > use C4::Utils::DataTables::Members; > use C4::Members; >-use C4::Search; # enabled_staff_search_views >+use C4::Search qw( enabled_staff_search_views ); > > use Koha::Biblios; > use Koha::DateUtils; >diff --git a/reviews/reviewswaiting.pl b/reviews/reviewswaiting.pl >index f5050d2ba5b..fcaf638c9b4 100755 >--- a/reviews/reviewswaiting.pl >+++ b/reviews/reviewswaiting.pl >@@ -18,8 +18,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( pagination_bar output_html_with_http_headers ); > use C4::Context; > use C4::Biblio; > use Koha::Biblios; >diff --git a/rotating_collections/addItems.pl b/rotating_collections/addItems.pl >index 5cd49df4368..3dc21534751 100755 >--- a/rotating_collections/addItems.pl >+++ b/rotating_collections/addItems.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::RotatingCollections; > use C4::Items; >diff --git a/rotating_collections/editCollections.pl b/rotating_collections/editCollections.pl >index 33014e9831b..6fd30759972 100755 >--- a/rotating_collections/editCollections.pl >+++ b/rotating_collections/editCollections.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > > use C4::RotatingCollections; >diff --git a/rotating_collections/rotatingCollections.pl b/rotating_collections/rotatingCollections.pl >index 7eb3975c034..4a814d25dbb 100755 >--- a/rotating_collections/rotatingCollections.pl >+++ b/rotating_collections/rotatingCollections.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::RotatingCollections; > >diff --git a/rotating_collections/transferCollection.pl b/rotating_collections/transferCollection.pl >index f4891354078..efb206415cd 100755 >--- a/rotating_collections/transferCollection.pl >+++ b/rotating_collections/transferCollection.pl >@@ -18,8 +18,8 @@ > > use Modern::Perl; > >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::RotatingCollections; > >diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl >index ece1232d192..ebcd9da1965 100755 >--- a/serials/acqui-search-result.pl >+++ b/serials/acqui-search-result.pl >@@ -41,9 +41,9 @@ acqui-search-result.pl > > > use Modern::Perl; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Acquisition qw( SearchOrders ); > use Koha::DateUtils; >diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl >index 58d659d4f87..b0a057a728d 100755 >--- a/serials/acqui-search.pl >+++ b/serials/acqui-search.pl >@@ -20,8 +20,8 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > my $query = CGI->new; > >diff --git a/serials/add_user_search.pl b/serials/add_user_search.pl >index b42b5faf389..1240670dde6 100755 >--- a/serials/add_user_search.pl >+++ b/serials/add_user_search.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/serials/checkexpiration.pl b/serials/checkexpiration.pl >index aeebd2f5bc6..6bb46a531b3 100755 >--- a/serials/checkexpiration.pl >+++ b/serials/checkexpiration.pl >@@ -44,9 +44,9 @@ The date to filter on. > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Serials; # GetExpirationDate >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Serials qw( SearchSubscriptions GetExpirationDate ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; > use Koha::DateUtils; > >diff --git a/serials/claims.pl b/serials/claims.pl >index 498f1cc2d9d..b1eb1b50cc4 100755 >--- a/serials/claims.pl >+++ b/serials/claims.pl >@@ -19,12 +19,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Serials; >+use C4::Auth qw( get_template_and_user ); >+use C4::Serials qw( GetSuppliersWithLateIssues GetLateOrMissingIssues updateClaim can_claim_subscription ); > use C4::Acquisition; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Letters; >+use C4::Letters qw( SendAlerts GetLetters ); > use C4::Koha qw( GetAuthorisedValues ); > > use Koha::AdditionalFields; >diff --git a/serials/create-numberpattern.pl b/serials/create-numberpattern.pl >index 506a539d39c..110daf5f004 100755 >--- a/serials/create-numberpattern.pl >+++ b/serials/create-numberpattern.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Serials::Numberpattern; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Auth qw( check_cookie_auth ); > use URI::Escape; > > my $input = CGI->new; >diff --git a/serials/lateissues-export.pl b/serials/lateissues-export.pl >index 7af3395d1b2..f6e0ab56e77 100755 >--- a/serials/lateissues-export.pl >+++ b/serials/lateissues-export.pl >@@ -18,7 +18,7 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Auth; >-use C4::Serials; >+use C4::Serials qw( GetLateOrMissingIssues updateClaim ); > use C4::Acquisition; > use C4::Output; > use C4::Context; >diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl >index 40a8344633d..61d7b068295 100755 >--- a/serials/routing-preview.pl >+++ b/serials/routing-preview.pl >@@ -21,16 +21,16 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Koha; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Acquisition; >-use C4::Reserves; >+use C4::Reserves qw( AddReserve ModReserve ); > use C4::Circulation; > use C4::Context; > use C4::Members; > use C4::Biblio; >-use C4::Items; >-use C4::Serials; >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Serials qw( delroutingmember getroutinglist GetSubscription GetSerials check_routing ); > use URI::Escape; > > use Koha::Biblios; >diff --git a/serials/routing.pl b/serials/routing.pl >index 6a237f6f6ea..0e888150cea 100755 >--- a/serials/routing.pl >+++ b/serials/routing.pl >@@ -28,14 +28,14 @@ printed out > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Koha; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Acquisition; >-use C4::Output; >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Context; > > use C4::Members; >-use C4::Serials; >+use C4::Serials qw( GetSubscription delroutingmember addroutingmember getroutinglist GetSerials GetLatestSerials check_routing ); > use Koha::Patrons; > > use URI::Escape; >diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl >index 14c5a44ff7d..7c7d3013e22 100755 >--- a/serials/serials-collection.pl >+++ b/serials/serials-collection.pl >@@ -21,11 +21,11 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Serials; >+use C4::Serials qw( ModSerialStatus GetSubscription GetNextExpected GetNextSeq GetNextDate NewIssue HasSubscriptionExpired abouttoexpire check_routing GetFullSubscription PrepareSerialsData CountSubscriptionFromBiblionumber GetSubscriptionsFromBiblionumber GetFullSubscriptionsFromBiblionumber ); > use C4::Letters; >-use C4::Output; >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Context; > use Koha::Serial::Items; > >diff --git a/serials/serials-edit.pl b/serials/serials-edit.pl >index ad0deb50a47..2bff4da87f1 100755 >--- a/serials/serials-edit.pl >+++ b/serials/serials-edit.pl >@@ -64,14 +64,14 @@ op can be : > use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode qw( decode is_utf8 ); >-use C4::Auth; >-use C4::Biblio; >-use C4::Items; >+use C4::Auth qw( get_template_and_user haspermission ); >+use C4::Biblio qw( TransformHtmlToXml GetMarcFromKohaField ); >+use C4::Items qw( sub PrepareItemrecordDisplay AddItemFromMarc ModItemFromMarc ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Context; >-use C4::Serials; >-use C4::Search qw/enabled_staff_search_views/; >+use C4::Serials qw( GetSerials GetSerials2 GetSerialInformation HasSubscriptionExpired GetSubscription abouttoexpire NewIssue ModSerialStatus GetPreviousSerialid AddItem2Serial ); >+use C4::Search qw( enabled_staff_search_views ); > > use Koha::DateUtils; > use Koha::Items; >diff --git a/serials/serials-home.pl b/serials/serials-home.pl >index 8f7cb154177..7133824235f 100755 >--- a/serials/serials-home.pl >+++ b/serials/serials-home.pl >@@ -30,9 +30,9 @@ this script is the main page for serials/ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Serials; > > my $query = CGI->new; >diff --git a/serials/serials-search.pl b/serials/serials-search.pl >index a0723286ca8..6b86fc59e18 100755 >--- a/serials/serials-search.pl >+++ b/serials/serials-search.pl >@@ -30,11 +30,11 @@ this script is the search page for serials > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; > use C4::Koha qw( GetAuthorisedValues ); >-use C4::Output; >-use C4::Serials; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Serials qw( CloseSubscription ReopenSubscription SearchSubscriptions check_routing ); > use Koha::AdditionalFields; > > use Koha::DateUtils; >diff --git a/serials/showpredictionpattern.pl b/serials/showpredictionpattern.pl >index d6bcfc79187..3ea342a0c32 100755 >--- a/serials/showpredictionpattern.pl >+++ b/serials/showpredictionpattern.pl >@@ -32,10 +32,10 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use Date::Calc qw(Today Day_of_Year Week_of_Year Day_of_Week Days_in_Year Delta_Days Add_Delta_Days Add_Delta_YM); >-use C4::Auth; >-use C4::Output; >-use C4::Serials; >-use C4::Serials::Frequency; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Serials qw( GetSubscription GetFictiveIssueNumber GetSeq GetSubscriptionIrregularities GetNextDate GetNextSeq ); >+use C4::Serials qw( GetSubscription GetFictiveIssueNumber GetSeq GetSubscriptionIrregularities GetNextDate GetNextSeq ); > use Koha::DateUtils; > > my $input = CGI->new; >diff --git a/serials/subscription-add.pl b/serials/subscription-add.pl >index 8e55ce05af3..ac4191a53d4 100755 >--- a/serials/subscription-add.pl >+++ b/serials/subscription-add.pl >@@ -19,16 +19,16 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use Date::Calc qw(Today Day_of_Year Week_of_Year Add_Delta_Days Add_Delta_YM); >-use C4::Koha; >-use C4::Biblio; >-use C4::Auth; >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Biblio qw( GetMarcBiblio ); >+use C4::Auth qw( get_template_and_user ); > use C4::Acquisition; >-use C4::Output; >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Context; >-use C4::Serials; >-use C4::Serials::Frequency; >-use C4::Serials::Numberpattern; >-use C4::Letters; >+use C4::Serials qw( GetSubscription GetNextExpected GetSerials GetSubscriptionLength NewSubscription ModNextExpected ModSubscription ); >+use C4::Serials qw( GetSubscription GetNextExpected GetSerials GetSubscriptionLength NewSubscription ModNextExpected ModSubscription ); >+use C4::Serials qw( GetSubscription GetNextExpected GetSerials GetSubscriptionLength NewSubscription ModNextExpected ModSubscription ); >+use C4::Letters qw( GetLetters ); > use Koha::AdditionalFields; > use Koha::Biblios; > use Koha::DateUtils; >diff --git a/serials/subscription-batchedit.pl b/serials/subscription-batchedit.pl >index b06f68d6c35..e8134f80370 100755 >--- a/serials/subscription-batchedit.pl >+++ b/serials/subscription-batchedit.pl >@@ -21,9 +21,9 @@ use Modern::Perl; > > use CGI qw( -utf8 ); > >-use C4::Auth; >-use C4::Output; >-use C4::Serials; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Serials qw( can_edit_subscription ); > use Koha::Subscriptions; > use Koha::Acquisition::Booksellers; > use Koha::AdditionalFields; >diff --git a/serials/subscription-bib-search.pl b/serials/subscription-bib-search.pl >index 049da968ccf..aba405e3378 100755 >--- a/serials/subscription-bib-search.pl >+++ b/serials/subscription-bib-search.pl >@@ -49,12 +49,12 @@ to multipage gestion. > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Koha; >-use C4::Auth; >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::Search; >-use C4::Biblio; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Search qw( new_record_from_zebra ); >+use C4::Biblio qw( TransformMarcToKoha ); > use C4::Debug; > > use Koha::ItemTypes; >diff --git a/serials/subscription-detail.pl b/serials/subscription-detail.pl >index ac4abcef180..67ceb5ada34 100755 >--- a/serials/subscription-detail.pl >+++ b/serials/subscription-detail.pl >@@ -18,13 +18,13 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Acquisition; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user checkauth ); > use C4::Budgets; > use C4::Koha; >-use C4::Serials; >-use C4::Output; >+use C4::Serials qw( CloseSubscription ReopenSubscription GetSubscription GetExpirationDate GetSerials HasSubscriptionStrictlyExpired CountIssues HasItems DelSubscription check_routing abouttoexpire can_edit_subscription ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Context; >-use C4::Search qw/enabled_staff_search_views/; >+use C4::Search qw( enabled_staff_search_views ); > > use Koha::AdditionalFields; > use Koha::AuthorisedValues; >diff --git a/serials/subscription-frequencies.pl b/serials/subscription-frequencies.pl >index ad14c0cd48c..a5d1e42d6ce 100755 >--- a/serials/subscription-frequencies.pl >+++ b/serials/subscription-frequencies.pl >@@ -31,10 +31,10 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >-use C4::Serials; >-use C4::Serials::Frequency; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Serials qw( GetSubscription ModSubscription DelSubscription ); >+use C4::Serials qw( GetSubscription ModSubscription DelSubscription ); > > my $input = CGI->new; > my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { >diff --git a/serials/subscription-frequency.pl b/serials/subscription-frequency.pl >index 2532f8f186b..2915f323b67 100755 >--- a/serials/subscription-frequency.pl >+++ b/serials/subscription-frequency.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; > use C4::Serials::Frequency; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Auth qw( check_cookie_auth ); > use JSON qw( to_json ); > > my $input=CGI->new; >diff --git a/serials/subscription-history.pl b/serials/subscription-history.pl >index 4001a5de876..4e324147d74 100755 >--- a/serials/subscription-history.pl >+++ b/serials/subscription-history.pl >@@ -30,11 +30,11 @@ Modify subscription history > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use C4::Biblio; >-use C4::Serials; >+use C4::Serials qw( ModSubscriptionHistory ModSubscription GetSubscriptionHistoryFromSubscriptionId GetSubscription ); > use Koha::Biblios; > use Koha::DateUtils; > >diff --git a/serials/subscription-numberpattern.pl b/serials/subscription-numberpattern.pl >index db178607213..47a7273db62 100755 >--- a/serials/subscription-numberpattern.pl >+++ b/serials/subscription-numberpattern.pl >@@ -20,7 +20,7 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Serials::Numberpattern; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Auth qw( check_cookie_auth ); > use JSON qw( to_json ); > > my $input=CGI->new; >diff --git a/serials/subscription-numberpatterns.pl b/serials/subscription-numberpatterns.pl >index a84c304ac88..6dba137b07e 100755 >--- a/serials/subscription-numberpatterns.pl >+++ b/serials/subscription-numberpatterns.pl >@@ -30,8 +30,8 @@ Manage numbering patterns > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Serials::Numberpattern; > use C4::Serials::Frequency; > >diff --git a/serials/subscription-renew.pl b/serials/subscription-renew.pl >index 80727da8665..d614fc14e27 100755 >--- a/serials/subscription-renew.pl >+++ b/serials/subscription-renew.pl >@@ -48,11 +48,11 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Carp; > use C4::Koha; >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Auth; >-use C4::Output; >-use C4::Serials; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); >+use C4::Serials qw( GetSubscription GetSubscriptionLength NewSubscription ReNewSubscription ); > use Koha::DateUtils; > > my $query = CGI->new; >diff --git a/serials/viewalerts.pl b/serials/viewalerts.pl >index 444d39c04f9..0e6ec61c2e0 100755 >--- a/serials/viewalerts.pl >+++ b/serials/viewalerts.pl >@@ -20,9 +20,9 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Subscriptions; > >diff --git a/services/itemrecorddisplay.pl b/services/itemrecorddisplay.pl >index 79ee88eb04e..f22faca8465 100755 >--- a/services/itemrecorddisplay.pl >+++ b/services/itemrecorddisplay.pl >@@ -30,9 +30,9 @@ It uses PrepareItemrecordDisplay > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::Items; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Items qw( PrepareItemrecordDisplay ); > > my $input = CGI->new; > my ($template, $loggedinuser, $cookie, $flags) = get_template_and_user( { >diff --git a/suggestion/add_user_search.pl b/suggestion/add_user_search.pl >index f6758aa2cf0..d4b5ff02434 100755 >--- a/suggestion/add_user_search.pl >+++ b/suggestion/add_user_search.pl >@@ -18,8 +18,8 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Members; > > use Koha::Patron::Categories; >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 64b4106b2d7..58cc53dfc64 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -20,12 +20,12 @@ > use Modern::Perl; > require Exporter; > use CGI qw ( -utf8 ); >-use C4::Auth; # get_template_and_user >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Suggestions; >-use C4::Koha; >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Budgets; >-use C4::Search; >+use C4::Search qw( FindDuplicate GetDistinctValues ); > use C4::Members; > use C4::Debug; > use Koha::DateUtils qw( dt_from_string ); >diff --git a/svc/cataloguing/automatic_linker.pl b/svc/cataloguing/automatic_linker.pl >index a04ccfb8c97..05f3821a27c 100755 >--- a/svc/cataloguing/automatic_linker.pl >+++ b/svc/cataloguing/automatic_linker.pl >@@ -20,8 +20,8 @@ > use Modern::Perl; > use CGI; > use JSON; >-use C4::Auth qw(check_cookie_auth); >-use C4::Biblio; >+use C4::Auth qw( check_cookie_auth ); >+use C4::Biblio qw( TransformHtmlToMarc BiblioAutoLink ); > use C4::Context; > > my $input = CGI->new; >diff --git a/t/lib/TestBuilder.pm b/t/lib/TestBuilder.pm >index a39be708666..8ad3ae00bcd 100644 >--- a/t/lib/TestBuilder.pm >+++ b/t/lib/TestBuilder.pm >@@ -3,8 +3,8 @@ package t::lib::TestBuilder; > use Modern::Perl; > > use Koha::Database; >-use C4::Biblio; >-use C4::Items; >+use C4::Biblio qw( AddBiblio ); >+use C4::Items qw( sub ); > use Koha::Biblios; > use Koha::Items; > use Koha::DateUtils qw( dt_from_string ); >diff --git a/tags/list.pl b/tags/list.pl >index 23a7d8e3458..3ffcbe638d6 100755 >--- a/tags/list.pl >+++ b/tags/list.pl >@@ -20,13 +20,13 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > >-use C4::Auth qw(:DEFAULT check_cookie_auth); >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetBiblioData ); > use C4::Context; >-use C4::Items; >+use C4::Items qw( GetItemsInfo ); > use C4::Koha; >-use C4::Tags qw(get_tags remove_tag get_tag_rows); >-use C4::Output; >+use C4::Tags qw( remove_tag get_tag_rows get_tag get_tags ); >+use C4::Output qw( output_html_with_http_headers ); > > my $needed_flags = { tools => 'moderate_tags' > }; # FIXME: replace when more specific permission is created. >diff --git a/tags/review.pl b/tags/review.pl >index 3acf28a9dc1..b292d6995dc 100755 >--- a/tags/review.pl >+++ b/tags/review.pl >@@ -25,13 +25,13 @@ use POSIX; > use CGI qw ( -utf8 ); > use CGI::Cookie; # need to check cookies before having CGI parse the POST request > use URI::Escape; >-use C4::Auth qw(:DEFAULT check_cookie_auth); >+use C4::Auth qw( check_cookie_auth get_template_and_user ); > use C4::Context; > use Koha::DateUtils; > # use C4::Koha; >-use C4::Output qw(:html :ajax pagination_bar); >+use C4::Output qw( output_with_http_headers is_ajax pagination_bar output_html_with_http_headers ); > use C4::Debug; >-use C4::Tags qw(get_tags get_approval_rows approval_counts whitelist blacklist is_approved); >+use C4::Tags qw( is_approved whitelist blacklist approval_counts get_approval_rows ); > > my $script_name = "/cgi-bin/koha/tags/review.pl"; > my $needed_flags = { tools => 'moderate_tags' }; # FIXME: replace when more specific permission is created. >diff --git a/tools/access_files.pl b/tools/access_files.pl >index 5ead5814aa0..7961517a45b 100755 >--- a/tools/access_files.pl >+++ b/tools/access_files.pl >@@ -23,10 +23,10 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > use File::stat qw(stat); > use Digest::MD5 qw(md5_hex); >diff --git a/tools/ajax-inventory.pl b/tools/ajax-inventory.pl >index 72175cfb7a5..a8c8c9d06d3 100755 >--- a/tools/ajax-inventory.pl >+++ b/tools/ajax-inventory.pl >@@ -2,7 +2,7 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( check_api_auth ); > use C4::Items qw( ModDateLastSeen ); > > my $input = CGI->new; >diff --git a/tools/automatic_item_modification_by_age.pl b/tools/automatic_item_modification_by_age.pl >index ae9bcec192b..c8a0d5a3713 100755 >--- a/tools/automatic_item_modification_by_age.pl >+++ b/tools/automatic_item_modification_by_age.pl >@@ -34,10 +34,10 @@ use Modern::Perl; > use CGI; > use JSON qw( to_json from_json ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Items; >-use C4::Output; >+use C4::Items qw( sub ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Koha; > > use Koha::Items; >diff --git a/tools/background-job-progress.pl b/tools/background-job-progress.pl >index 625389f9029..9e45292ebd9 100755 >--- a/tools/background-job-progress.pl >+++ b/tools/background-job-progress.pl >@@ -24,7 +24,7 @@ use IO::File; > use CGI qw ( -utf8 ); > use CGI::Session; > use C4::Context; >-use C4::Auth qw/check_cookie_auth/; >+use C4::Auth qw( check_cookie_auth ); > use C4::BackgroundJob; > use CGI::Cookie; # need to check cookies before > # having CGI parse the POST request >diff --git a/tools/batchMod.pl b/tools/batchMod.pl >index b36752c77d0..f8f56d90e2a 100755 >--- a/tools/batchMod.pl >+++ b/tools/batchMod.pl >@@ -22,15 +22,15 @@ use CGI qw ( -utf8 ); > use Modern::Perl; > use Try::Tiny; > >-use C4::Auth; >-use C4::Output; >-use C4::Biblio; >-use C4::Items; >-use C4::Circulation; >+use C4::Auth qw( get_template_and_user haspermission ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Biblio qw( GetMarcStructure GetMarcFromKohaField TransformHtmlToXml DelBiblio IsMarcStructureInternal GetAuthorisedValueDesc ); >+use C4::Items qw( sub Item2Marc ModItemFromMarc GetItemsInfo ); >+use C4::Circulation qw( LostItem IsItemIssued ); > use C4::Context; > use C4::Koha; > use C4::BackgroundJob; >-use C4::ClassSource; >+use C4::ClassSource qw( GetClassSources GetClassSource ); > use C4::Debug; > use C4::Members; > use MARC::File::XML; >diff --git a/tools/batch_delete_records.pl b/tools/batch_delete_records.pl >index ea87d8b6c85..268a08f46b2 100755 >--- a/tools/batch_delete_records.pl >+++ b/tools/batch_delete_records.pl >@@ -23,10 +23,10 @@ use Modern::Perl; > use CGI; > use List::MoreUtils qw( uniq ); > >-use C4::Auth; >-use C4::Output; >-use C4::AuthoritiesMarc; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio CountItemsIssued DelBiblio ); > use Koha::Virtualshelves; > > use Koha::Authorities; >diff --git a/tools/batch_record_modification.pl b/tools/batch_record_modification.pl >index d118120768d..d101be38dba 100755 >--- a/tools/batch_record_modification.pl >+++ b/tools/batch_record_modification.pl >@@ -27,7 +27,7 @@ use Try::Tiny; > > use C4::Auth qw( get_template_and_user ); > use C4::Output qw( output_html_with_http_headers ); >-use C4::AuthoritiesMarc qw( BuildSummary ModAuthority ); >+use C4::Auth qw( get_template_and_user ); > use C4::Biblio qw( GetMarcBiblio ModBiblio ); > use C4::MarcModificationTemplates qw( GetModificationTemplateActions GetModificationTemplates ); > >diff --git a/tools/batch_records_ajax.pl b/tools/batch_records_ajax.pl >index 4ddb0f53691..9f47835c536 100755 >--- a/tools/batch_records_ajax.pl >+++ b/tools/batch_records_ajax.pl >@@ -36,8 +36,8 @@ use JSON qw/ to_json /; > > use C4::Context; > use C4::Charset; >-use C4::Auth qw/check_cookie_auth/; >-use C4::ImportBatch; >+use C4::Auth qw( check_cookie_auth ); >+use C4::ImportBatch qw( GetImportBatch GetImportRecordsRange GetImportRecordMatches ); > > my $input = CGI->new; > >diff --git a/tools/cleanborrowers.pl b/tools/cleanborrowers.pl >index 1afc3f95406..f52ef54c753 100755 >--- a/tools/cleanborrowers.pl >+++ b/tools/cleanborrowers.pl >@@ -34,9 +34,9 @@ This script allows to do 2 things. > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::Members; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Members qw( GetBorrowersToExpunge ); > use C4::Circulation; # AnonymiseIssueHistory. > use Koha::DateUtils qw( dt_from_string output_pref ); > use Koha::Patron::Categories; >diff --git a/tools/copy-holidays.pl b/tools/copy-holidays.pl >index e11353a09da..381f9e70a54 100755 >--- a/tools/copy-holidays.pl >+++ b/tools/copy-holidays.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Output; > > >diff --git a/tools/csv-profiles.pl b/tools/csv-profiles.pl >index e6a7bdaa0d8..3c9755ff01c 100755 >--- a/tools/csv-profiles.pl >+++ b/tools/csv-profiles.pl >@@ -37,9 +37,9 @@ This script allow the user to define a new profile for CSV export > use Modern::Perl; > use Encode; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use CGI qw ( -utf8 ); > use C4::Koha; > use Koha::CsvProfiles; >diff --git a/tools/exceptionHolidays.pl b/tools/exceptionHolidays.pl >index 68940744594..6bd650c5a9e 100755 >--- a/tools/exceptionHolidays.pl >+++ b/tools/exceptionHolidays.pl >@@ -4,7 +4,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Output; > use DateTime; > >diff --git a/tools/export.pl b/tools/export.pl >index 6d677abf5b1..1a7b5dbc85a 100755 >--- a/tools/export.pl >+++ b/tools/export.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use MARC::File::XML; > use List::MoreUtils qw(uniq); >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Authority::Types; > use Koha::Biblioitems; >diff --git a/tools/holidays.pl b/tools/holidays.pl >index 252882dbef3..e8ca096c14f 100755 >--- a/tools/holidays.pl >+++ b/tools/holidays.pl >@@ -20,8 +20,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > > use C4::Calendar; > use Koha::DateUtils; >diff --git a/tools/import_borrowers.pl b/tools/import_borrowers.pl >index f722568942f..0dd584fa226 100755 >--- a/tools/import_borrowers.pl >+++ b/tools/import_borrowers.pl >@@ -36,8 +36,8 @@ > > use Modern::Perl; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Templates; > use Koha::Patrons; > use Koha::DateUtils; >diff --git a/tools/inventory.pl b/tools/inventory.pl >index 7503e8ce5d9..368ced987d4 100755 >--- a/tools/inventory.pl >+++ b/tools/inventory.pl >@@ -26,15 +26,15 @@ my $input = CGI->new; > my $uploadbarcodes = $input->param('uploadbarcodes'); > my $barcodelist = $input->param('barcodelist'); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; >-use C4::Items; >-use C4::Koha; >-use C4::Circulation; >-use C4::Reports::Guided; #_get_column_defs >-use C4::Charset; >+use C4::Items qw( GetItemsForInventory sub ); >+use C4::Koha qw( GetAuthorisedValues ); >+use C4::Circulation qw( AddReturn ); >+use C4::Reports::Guided qw( _get_column_defs ); >+use C4::Charset qw( NormalizeString ); > > use Koha::Biblios; > use Koha::DateUtils; >diff --git a/tools/koha-news.pl b/tools/koha-news.pl >index 2b62aaf0576..e1337813225 100755 >--- a/tools/koha-news.pl >+++ b/tools/koha-news.pl >@@ -24,12 +24,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::NewsChannels; >-use C4::Languages qw(getTranslatedLanguages); >+use C4::Languages qw( getTranslatedLanguages ); > use Date::Calc qw/Date_to_Days Today/; > use Koha::DateUtils; > >diff --git a/tools/letter.pl b/tools/letter.pl >index faf80e7d393..db35984b7bb 100755 >--- a/tools/letter.pl >+++ b/tools/letter.pl >@@ -42,10 +42,10 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >-use C4::Letters; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Letters qw( GetLetterTemplates GetMessageTransportTypes GetMessage getletter ); > use C4::Log; > > use Koha::Patron::Attribute::Types; >diff --git a/tools/manage-marc-import.pl b/tools/manage-marc-import.pl >index eed338f7596..ae8534ffef9 100755 >--- a/tools/manage-marc-import.pl >+++ b/tools/manage-marc-import.pl >@@ -27,11 +27,11 @@ use MARC::File::USMARC; > # Koha modules used > use C4::Context; > use C4::Koha; >-use C4::Auth; >-use C4::AuthoritiesMarc; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; >-use C4::ImportBatch; >+use C4::ImportBatch qw( CleanBatch DeleteBatch sub GetImportBatch GetImportBatchOverlayAction GetImportBatchNoMatchAction GetImportBatchItemAction SetImportBatchOverlayAction SetImportBatchNoMatchAction SetImportBatchItemAction BatchFindDuplicates SetImportBatchMatcher GetItemNumbersFromImportBatch GetImportBatchRangeDesc GetNumberOfNonZ3950ImportBatches BatchCommitRecords BatchRevertRecords ); > use C4::Matcher; > use C4::BackgroundJob; > use C4::Labels::Batch; >diff --git a/tools/marc_modification_templates.pl b/tools/marc_modification_templates.pl >index 69bea401d2f..0a71dd7da2f 100755 >--- a/tools/marc_modification_templates.pl >+++ b/tools/marc_modification_templates.pl >@@ -20,9 +20,9 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::MarcModificationTemplates; > > my $cgi = CGI->new; >diff --git a/tools/modborrowers.pl b/tools/modborrowers.pl >index ee896848d1b..c11c5663e5c 100755 >--- a/tools/modborrowers.pl >+++ b/tools/modborrowers.pl >@@ -27,10 +27,10 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Koha; >+use C4::Auth qw( get_template_and_user ); >+use C4::Koha qw( GetAuthorisedValues ); > use C4::Members; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use List::MoreUtils qw /any uniq/; > use Koha::DateUtils qw( dt_from_string ); > use Koha::List::Patron; >diff --git a/tools/newHolidays.pl b/tools/newHolidays.pl >index c402dfdf7f2..d82c9acda94 100755 >--- a/tools/newHolidays.pl >+++ b/tools/newHolidays.pl >@@ -21,7 +21,7 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > >-use C4::Auth; >+use C4::Auth qw( checkauth ); > use C4::Output; > > use C4::Calendar; >diff --git a/tools/overduerules.pl b/tools/overduerules.pl >index 293c51c78ab..777914c6385 100755 >--- a/tools/overduerules.pl >+++ b/tools/overduerules.pl >@@ -20,12 +20,12 @@ > use Modern::Perl; > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; >-use C4::Letters; >+use C4::Letters qw( GetLetters GetLettersAvailableForALibrary GetMessageTransportTypes GetMessage ); > use C4::Members; >-use C4::Overdues; >+use C4::Overdues qw( GetOverdueMessageTransportTypes ); > use Koha::Libraries; > > use Koha::Patron::Categories; >diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl >index 31dec5193e4..39f9b35f95d 100755 >--- a/tools/picture-upload.pl >+++ b/tools/picture-upload.pl >@@ -26,8 +26,8 @@ use File::Copy; > use CGI qw ( -utf8 ); > use GD; > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_and_exit output_html_with_http_headers ); > use C4::Members; > use C4::Debug; > >diff --git a/tools/problem-reports.pl b/tools/problem-reports.pl >index 0b07511cf3f..31a3671b688 100755 >--- a/tools/problem-reports.pl >+++ b/tools/problem-reports.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Context; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > use Koha::ProblemReports; > > my $query = CGI->new; >diff --git a/tools/quotes-upload.pl b/tools/quotes-upload.pl >index 8ca4583471e..8ce8e7eb20b 100755 >--- a/tools/quotes-upload.pl >+++ b/tools/quotes-upload.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use autouse 'Data::Dumper' => qw(Dumper); > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Koha; > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > my $cgi = CGI->new; > >diff --git a/tools/quotes.pl b/tools/quotes.pl >index 57859f14b25..88db8502644 100755 >--- a/tools/quotes.pl >+++ b/tools/quotes.pl >@@ -20,9 +20,9 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Try::Tiny; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Quotes; > > my $input = CGI->new; >diff --git a/tools/scheduler.pl b/tools/scheduler.pl >index 295a04bfdc6..63524ac2a7c 100755 >--- a/tools/scheduler.pl >+++ b/tools/scheduler.pl >@@ -19,11 +19,11 @@ > > use Modern::Perl; > use C4::Context; >-use C4::Scheduler; >-use C4::Reports::Guided; >-use C4::Auth; >+use C4::Scheduler qw( add_at_job remove_at_job get_jobs ); >+use C4::Reports::Guided qw( get_saved_reports ); >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use Koha::DateUtils;; > > use vars qw($debug); >diff --git a/tools/showdiffmarc.pl b/tools/showdiffmarc.pl >index c39d2ad91b6..1be1ffb6d03 100755 >--- a/tools/showdiffmarc.pl >+++ b/tools/showdiffmarc.pl >@@ -26,11 +26,11 @@ use CGI qw(:standard -utf8); > > # Koha modules used > use C4::Context; >-use C4::Output; >-use C4::Auth; >-use C4::Biblio; >-use C4::AuthoritiesMarc; >-use C4::ImportBatch; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio ); >+use C4::Auth qw( get_template_and_user ); >+use C4::ImportBatch qw( GetRecordFromImportBiblio GetImportBiblios ); > > use Koha::Biblios; > >diff --git a/tools/stage-marc-import.pl b/tools/stage-marc-import.pl >index 9f285efe874..d9d20b96adc 100755 >--- a/tools/stage-marc-import.pl >+++ b/tools/stage-marc-import.pl >@@ -33,10 +33,10 @@ use MARC::File::USMARC; > > # Koha modules used > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use C4::Biblio; >-use C4::ImportBatch; >+use C4::ImportBatch qw( RecordsFromMARCXMLFile RecordsFromISO2709File RecordsFromMarcPlugin BatchStageMarcRecords BatchFindDuplicates SetImportBatchMatcher SetImportBatchOverlayAction SetImportBatchNoMatchAction SetImportBatchItemAction sub ); > use C4::Matcher; > use Koha::UploadedFiles; > use C4::BackgroundJob; >diff --git a/tools/stockrotation.pl b/tools/stockrotation.pl >index 18891fa3db6..b1d25484561 100755 >--- a/tools/stockrotation.pl >+++ b/tools/stockrotation.pl >@@ -27,16 +27,16 @@ > use Modern::Perl; > use CGI; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use C4::Context; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > > use Koha::Libraries; > use Koha::StockRotationRotas; > use Koha::StockRotationItems; > use Koha::StockRotationStages; > use Koha::Item; >-use Koha::Util::StockRotation qw(:ALL); >+use Koha::Util::StockRotation qw( get_branches get_stages move_to_next_stage toggle_indemand remove_from_stage add_items_to_rota get_barcodes_status ); > > my $input = CGI->new; > >diff --git a/tools/tools-home.pl b/tools/tools-home.pl >index 69fc092ae11..ed84193546c 100755 >--- a/tools/tools-home.pl >+++ b/tools/tools-home.pl >@@ -18,9 +18,9 @@ > use Modern::Perl; > > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Output; >-use C4::Tags qw/get_count_by_tag_status/; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Tags qw( get_count_by_tag_status ); > use Koha::Reviews; > > my $query = CGI->new; >diff --git a/tools/upload-cover-image.pl b/tools/upload-cover-image.pl >index 82b0bb50b17..f9cbc6fde06 100755 >--- a/tools/upload-cover-image.pl >+++ b/tools/upload-cover-image.pl >@@ -43,8 +43,8 @@ use File::Temp; > use CGI qw ( -utf8 ); > use GD; > use C4::Context; >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Biblios; > use Koha::CoverImages; > use Koha::Items; >diff --git a/tools/upload-file.pl b/tools/upload-file.pl >index 86ef2c5dc2d..bef77ab260a 100755 >--- a/tools/upload-file.pl >+++ b/tools/upload-file.pl >@@ -26,7 +26,7 @@ use JSON; > use URI::Escape; > > use C4::Context; >-use C4::Auth qw/check_cookie_auth haspermission/; >+use C4::Auth qw( check_cookie_auth get_session ); > use Koha::Uploader; > > # upload-file.pl must authenticate the user >diff --git a/tools/upload.pl b/tools/upload.pl >index cf9a2c60536..1bbe2f97519 100755 >--- a/tools/upload.pl >+++ b/tools/upload.pl >@@ -21,8 +21,8 @@ use Modern::Perl; > use CGI qw/-utf8/; > use JSON; > >-use C4::Auth; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::UploadedFiles; > > use constant ERR_READING => 'UPLERR_FILE_NOT_READ'; >diff --git a/tools/viewlog.pl b/tools/viewlog.pl >index e67e911c40d..a4ba8ed7f74 100755 >--- a/tools/viewlog.pl >+++ b/tools/viewlog.pl >@@ -20,16 +20,16 @@ > > use Modern::Perl; > >-use C4::Auth; >+use C4::Auth qw( get_template_and_user ); > use CGI qw ( -utf8 ); > use Text::CSV::Encoded; > use C4::Context; > use C4::Koha; >-use C4::Output; >-use C4::Items; >-use C4::Serials; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Items qw( sub ); >+use C4::Serials qw( CountSubscriptionFromBiblionumber ); > use C4::Debug; >-use C4::Search; # enabled_staff_search_views >+use C4::Search qw( enabled_staff_search_views ); > > use Koha::ActionLogs; > use Koha::Database; >diff --git a/virtualshelves/addbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl >index 68e7da5035a..3c55e3c50e7 100755 >--- a/virtualshelves/addbybiblionumber.pl >+++ b/virtualshelves/addbybiblionumber.pl >@@ -60,8 +60,8 @@ use Modern::Perl; > > use CGI qw ( -utf8 ); > use C4::Biblio; >-use C4::Output; >-use C4::Auth; >+use C4::Output qw( output_html_with_http_headers ); >+use C4::Auth qw( get_template_and_user ); > > use Koha::Biblios; > use Koha::Virtualshelves; >diff --git a/virtualshelves/downloadshelf.pl b/virtualshelves/downloadshelf.pl >index c6cb31f4968..b0091193abc 100755 >--- a/virtualshelves/downloadshelf.pl >+++ b/virtualshelves/downloadshelf.pl >@@ -22,10 +22,10 @@ use Modern::Perl; > use CGI qw ( -utf8 ); > use Encode qw(encode); > >-use C4::Auth; >-use C4::Biblio; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio ); > use C4::Items; >-use C4::Output; >+use C4::Output qw( output_html_with_http_headers ); > use C4::Record; > use C4::Ris; > >diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl >index f15e2c9f64d..a9518670516 100755 >--- a/virtualshelves/sendshelf.pl >+++ b/virtualshelves/sendshelf.pl >@@ -24,10 +24,10 @@ use Encode qw( encode ); > use Carp; > use Try::Tiny; > >-use C4::Auth; >-use C4::Biblio; >-use C4::Items; >-use C4::Output; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetBiblioData GetMarcBiblio GetMarcAuthors GetMarcSubjects GetMarcISBN ); >+use C4::Items qw( sub GetItemsInfo ); >+use C4::Output qw( output_html_with_http_headers ); > use Koha::Email; > use Koha::Virtualshelves; > >diff --git a/virtualshelves/shelves.pl b/virtualshelves/shelves.pl >index d233eb1355b..ac29aa1ae89 100755 >--- a/virtualshelves/shelves.pl >+++ b/virtualshelves/shelves.pl >@@ -19,12 +19,12 @@ > > use Modern::Perl; > use CGI qw ( -utf8 ); >-use C4::Auth; >-use C4::Biblio; >-use C4::Koha; >-use C4::Items; >+use C4::Auth qw( get_template_and_user ); >+use C4::Biblio qw( GetMarcBiblio ); >+use C4::Koha qw( getitemtypeimagelocation GetNormalizedUPC GetNormalizedEAN GetNormalizedOCLCNumber GetNormalizedISBN ); >+use C4::Items qw( sub GetItemsLocationInfo ); > use C4::Members; >-use C4::Output; >+use C4::Output qw( pagination_bar output_html_with_http_headers ); > use C4::XSLT; > > use Koha::Biblios; >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17600
:
57394
|
57950
|
57951
|
57952
|
57953
|
57954
|
61994
|
61995
|
61996
|
61997
|
61998
|
62209
|
62210
|
62211
|
62212
|
62213
|
62940
|
62941
|
62942
|
62943
|
62958
|
62959
|
64387
|
64388
|
64389
|
64390
|
64391
|
64392
|
64466
|
64467
|
64468
|
64469
|
64470
|
64471
|
64472
|
64473
|
64474
|
64475
|
64476
|
121309
|
121310
|
121311
|
121312
|
121313
|
121314
|
122360
|
122361
|
122362
|
122363
|
122364
|
122365
|
122869
|
122884
|
122945
|
123194
|
123195
|
123196
|
123200
|
123210
|
123281
|
123283
|
123284
|
123325
|
123417
|
123418
|
123419
|
123420
|
123565
|
124866
|
125059
|
125063
|
125064
|
125066
|
126640
|
127056
|
127918