projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
18b6953
)
move use statements to beginning instead of in subs
author
Ivan Kohler
<ivan@freeside.biz>
Sun, 19 Jan 2014 05:39:35 +0000
(21:39 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Sun, 19 Jan 2014 05:39:35 +0000
(21:39 -0800)
FS/FS/Setup.pm
patch
|
blob
|
history
diff --git
a/FS/FS/Setup.pm
b/FS/FS/Setup.pm
index
cac26c1
..
5e28c13
100644
(file)
--- a/
FS/FS/Setup.pm
+++ b/
FS/FS/Setup.pm
@@
-1,19
+1,32
@@
package FS::Setup;
package FS::Setup;
+use base qw( Exporter );
use strict;
use strict;
-use vars qw( @ISA @EXPORT_OK );
-use Exporter;
+use vars qw( ISA @EXPORT_OK );
#use Tie::DxHash;
use Tie::IxHash;
use Crypt::OpenSSL::RSA;
use FS::UID qw( dbh driver_name );
#use Tie::DxHash;
use Tie::IxHash;
use Crypt::OpenSSL::RSA;
use FS::UID qw( dbh driver_name );
-use FS::Record;
+
#
use FS::Record;
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
$FS::svc_domain::whois_hack = 1;
use FS::svc_domain;
$FS::svc_domain::whois_hack = 1;
$FS::svc_domain::whois_hack = 1;
-@ISA = qw( Exporter );
+#populate_locales
+use Locale::Country;
+use Locale::SubCountry 1.42;
+use FS::cust_main_county;
+
+#populate_access
+use FS::AccessRight;
+use FS::access_right;
+use FS::access_groupagent;
+
+#populate_msgcat
+use FS::Record qw(qsearch);
+use FS::msgcat;
+
@EXPORT_OK = qw( create_initial_data enable_encryption );
=head1 NAME
@EXPORT_OK = qw( create_initial_data enable_encryption );
=head1 NAME
@@
-93,9
+106,6
@@
sub populate_numbering {
sub populate_locales {
sub populate_locales {
- use Locale::Country;
- use FS::cust_main_county;
-
#cust_main_county
foreach my $country ( sort map uc($_), all_country_codes ) {
_add_country($country);
#cust_main_county
foreach my $country ( sort map uc($_), all_country_codes ) {
_add_country($country);
@@
-127,8
+137,6
@@
sub populate_addl_locales {
sub _add_country {
sub _add_country {
- use Locale::SubCountry 1.42;
-
my( $country ) = shift;
my $subcountry = eval { new Locale::SubCountry($country) };
my( $country ) = shift;
my $subcountry = eval { new Locale::SubCountry($country) };
@@
-411,10
+419,6
@@
sub initial_data {
sub populate_access {
sub populate_access {
- use FS::AccessRight;
- use FS::access_right;
- use FS::access_groupagent;
-
foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
my $access_right = new FS::access_right {
'righttype' => 'FS::access_group',
foreach my $rightname ( FS::AccessRight->default_superuser_rights ) {
my $access_right = new FS::access_right {
'righttype' => 'FS::access_group',
@@
-438,9
+442,6
@@
sub populate_access {
sub populate_msgcat {
sub populate_msgcat {
- use FS::Record qw(qsearch);
- use FS::msgcat;
-
foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
my $error = $del_msgcat->delete;
die $error if $error;
foreach my $del_msgcat ( qsearch('msgcat', {}) ) {
my $error = $del_msgcat->delete;
die $error if $error;