From e660a339a85e7baa2d2fa9e7e9cdcb8bf9b5107e Mon Sep 17 00:00:00 2001
From: Joe Atzberger <joe.atzberger@liblime.com>
Date: Mon, 7 Jan 2008 13:53:01 -0600
Subject: [PATCH] Members.pm - BEGIN block VERSION and vars related to export.

Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 C4/Languages.pm |   2 +-
 C4/Members.pm   | 143 +++++++++++++++++++++++-------------------------
 2 files changed, 70 insertions(+), 75 deletions(-)

diff --git a/C4/Languages.pm b/C4/Languages.pm
index 06b12d3f10..83cd6c1862 100644
--- a/C4/Languages.pm
+++ b/C4/Languages.pm
@@ -22,7 +22,7 @@ package C4::Languages;
 use strict; 
 use warnings;	#FIXME: turn off warnings before release
 use C4::Context;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG);
 
 BEGIN {
 	$VERSION = 3.00;
diff --git a/C4/Members.pm b/C4/Members.pm
index bcb0f00e06..d09512bf7c 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -19,7 +19,6 @@ package C4::Members;
 
 
 use strict;
-require Exporter;
 use C4::Context;
 use C4::Dates qw(format_date_in_iso);
 use Digest::MD5 qw(md5_base64);
@@ -32,8 +31,75 @@ use C4::Accounts;
 our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,$debug);
 
 BEGIN {
-    $VERSION = 3.02;
-    $debug = $ENV{DEBUG} || 0;
+	$VERSION = 3.02;
+	$debug = $ENV{DEBUG} || 0;
+	require Exporter;
+	@ISA = qw(Exporter);
+	#Get data
+	push @EXPORT, qw(
+		&SearchMember 
+		&GetMemberDetails
+		&GetMember
+
+		&GetGuarantees 
+
+		&GetMemberIssuesAndFines
+		&GetPendingIssues
+		&GetAllIssues
+
+		&get_institutions 
+		&getzipnamecity 
+		&getidcity
+
+		&GetAge 
+		&GetCities 
+		&GetRoadTypes 
+		&GetRoadTypeDetails 
+		&GetSortDetails
+		&GetTitles	
+
+		&GetMemberAccountRecords
+		&GetBorNotifyAcctRecord
+
+		&GetborCatFromCatType 
+		&GetBorrowercategory
+
+		&GetBorrowersWhoHaveNotBorrowedSince
+		&GetBorrowersWhoHaveNeverBorrowed
+		&GetBorrowersWithIssuesHistoryOlderThan
+
+		&GetExpiryDate
+	);
+
+	#Modify data
+	push @EXPORT, qw(
+		&ModMember
+		&changepassword
+	);
+
+	#Delete data
+	push @EXPORT, qw(
+		&DelMember
+	);
+
+	#Insert data
+	push @EXPORT, qw(
+		&AddMember
+		&add_member_orgs
+		&MoveMemberToDeleted
+		&ExtendMemberSubscriptionTo 
+	);
+
+	#Check data
+	push @EXPORT, qw(
+		&checkuniquemember 
+		&checkuserpassword
+		&Check_Userid
+		&fixEthnicity
+		&ethnicitycategories 
+		&fixup_cardnumber
+		&checkcardnumber
+	);
 }
 
 =head1 NAME
@@ -52,77 +118,6 @@ This module contains routines for adding, modifying and deleting members/patrons
 
 =over 2
 
-=cut
-
-@ISA = qw(Exporter);
-
-#Get data
-push @EXPORT, qw(
-  &SearchMember 
-  &GetMemberDetails
-  &GetMember
-  
-  &GetGuarantees 
-  
-  &GetMemberIssuesAndFines
-  &GetPendingIssues
-  &GetAllIssues
-  
-  &get_institutions 
-  &getzipnamecity 
-  &getidcity
-   
-  &GetAge 
-  &GetCities 
-  &GetRoadTypes 
-  &GetRoadTypeDetails 
-  &GetSortDetails
-  &GetTitles    
-  
-  &GetMemberAccountRecords
-  &GetBorNotifyAcctRecord
-  
-  &GetborCatFromCatType 
-  &GetBorrowercategory
-  
-  
-  &GetBorrowersWhoHaveNotBorrowedSince
-  &GetBorrowersWhoHaveNeverBorrowed
-  &GetBorrowersWithIssuesHistoryOlderThan
-  
-  &GetExpiryDate
-);
-
-#Modify data
-push @EXPORT, qw(
-  &ModMember
-  &changepassword
-);
-  
-#Delete data
-push @EXPORT, qw(
-  &DelMember
-);
-
-#Insert data
-push @EXPORT, qw(
-  &AddMember
-  &add_member_orgs
-  &MoveMemberToDeleted
-  &ExtendMemberSubscriptionTo 
-);
-
-#Check data
-push @EXPORT, qw(
-  &checkuniquemember 
-  &checkuserpassword
-    &Check_Userid
-  &fixEthnicity
-  &ethnicitycategories 
-  &fixup_cardnumber
-    &checkcardnumber
-);
-
 =item SearchMember
 
   ($count, $borrowers) = &SearchMember($searchstring, $type,$category_type,$filter,$showallbranches);
-- 
2.20.1