remove unnecessary circular use of FS::ClientAPI, doesn't work with 5.8.[56] + perl??

5 files changed, 11 insertions, 7 deletions

diff --git a/FS/FS/ClientAPI.pm b/FS/FS/ClientAPI.pm
index 7cbbdbf..1109ede 100644
--- a/FS/FS/ClientAPI.pm
+++ b/FS/FS/ClientAPI.pm
@@ -1,19 +1,23 @@
 package FS::ClientAPI;
 
 use strict;
-use vars qw(%handler $domain);
+use vars qw(%handler $domain $DEBUG);
+
+$DEBUG = 1;
 
 %handler = ();
 
 #find modules
 foreach my $INC ( @INC ) {
-  foreach my $file ( glob("$INC/FS/ClientAPI/*.pm") ) {
+  my $glob = "$INC/FS/ClientAPI/*.pm";
+  warn "FS::ClientAPI: searching $glob" if $DEBUG;
+  foreach my $file ( glob($glob) ) {
     $file =~ /\/(\w+)\.pm$/ or do {
       warn "unrecognized ClientAPI file: $file";
       next
     };
     my $mod = $1;
-    #warn "using FS::ClientAPI::$mod";
+    warn "using FS::ClientAPI::$mod" if $DEBUG;
     eval "use FS::ClientAPI::$mod;";
     die "error using FS::ClientAPI::$mod: $@" if $@;
   }
diff --git a/FS/FS/ClientAPI/Agent.pm b/FS/FS/ClientAPI/Agent.pm
index f534a86..749934d 100644
--- a/FS/FS/ClientAPI/Agent.pm
+++ b/FS/FS/ClientAPI/Agent.pm
@@ -10,7 +10,7 @@ use FS::Record qw(qsearchs); # qsearch dbdef dbh);
 use FS::agent;
 use FS::cust_main qw(smart_search);
 
-use FS::ClientAPI;
+#use FS::ClientAPI;
 FS::ClientAPI->register_handlers(
   'Agent/agent_login'          => \&agent_login,
   'Agent/agent_logout'         => \&agent_logout,
diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index a52e83d..c74f6ea 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -19,7 +19,7 @@ use FS::cust_bill;
 use FS::cust_main_county;
 use FS::cust_pkg;
 
-use FS::ClientAPI; #hmm
+#use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
   'MyAccount/login'              => \&login,
   'MyAccount/logout'             => \&logout,
diff --git a/FS/FS/ClientAPI/Signup.pm b/FS/FS/ClientAPI/Signup.pm
index 46ef9e4..0089e30 100644
--- a/FS/FS/ClientAPI/Signup.pm
+++ b/FS/FS/ClientAPI/Signup.pm
@@ -16,7 +16,7 @@ use FS::acct_snarf;
 use FS::queue;
 use FS::reg_code;
 
-use FS::ClientAPI; #hmm
+#use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
   'Signup/signup_info'  => \&signup_info,
   'Signup/new_customer' => \&new_customer,
diff --git a/FS/FS/ClientAPI/passwd.pm b/FS/FS/ClientAPI/passwd.pm
index cb839ec..b5c098b 100644
--- a/FS/FS/ClientAPI/passwd.pm
+++ b/FS/FS/ClientAPI/passwd.pm
@@ -5,7 +5,7 @@ use FS::Record qw(qsearchs);
 use FS::svc_acct;
 use FS::svc_domain;
 
-use FS::ClientAPI; #hmm
+#use FS::ClientAPI; #hmm
 FS::ClientAPI->register_handlers(
   'passwd/passwd' => \&passwd,
   'passwd/chfn' => \&chfn,