X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FXMLRPC.pm;h=84f3e4141f60dcccfa32fa38faa0b8da45065062;hb=c62991706722410987b249893f1323b4ba0e7a5f;hp=d7ba75a233dcf1edf5ffc9b5a689430dd9211f96;hpb=a18e0aadb62be9f96c0aa42b3a6464dc933477dc;p=freeside.git diff --git a/FS/FS/XMLRPC.pm b/FS/FS/XMLRPC.pm index d7ba75a23..84f3e4141 100644 --- a/FS/FS/XMLRPC.pm +++ b/FS/FS/XMLRPC.pm @@ -7,6 +7,7 @@ use Frontier::RPC2; # Instead of 'use'ing freeside modules on the fly below, just preload them now. use FS; use FS::CGI; +use FS::Conf; use FS::Record; use FS::cust_main; @@ -96,23 +97,37 @@ sub _serve { #Subroutine, not method warn "fssub: ${fssub}" if $DEBUG; warn "params: " . Dumper($params) if $DEBUG; - unless (UNIVERSAL::can("FS::${class}", $sub)) { - warn "FS::XMLRPC: Can't call undefined subroutine '${fssub}'"; - # Should we encode an error in the response, - # or just break silently to the remote caller and complain locally? - return []; - } - my @result; - eval { - no strict 'refs'; - my $fssub = "FS::${class}::${sub}"; - @result = (&$fssub(@$params)); - }; - - if ($@) { - warn "FS::XMLRPC: Error while calling '${fssub}': $@"; - return []; + + if ($class eq 'Conf') { #Special case for FS::Conf because we need an obj. + + if ($sub eq 'config') { + my $conf = new FS::Conf; + @result = ($conf->config(@$params)); + } else { + warn "FS::XMLRPC: Can't call undefined subroutine '${fssub}'"; + } + + } else { + + unless (UNIVERSAL::can("FS::${class}", $sub)) { + warn "FS::XMLRPC: Can't call undefined subroutine '${fssub}'"; + # Should we encode an error in the response, + # or just break silently to the remote caller and complain locally? + return []; + } + + eval { + no strict 'refs'; + my $fssub = "FS::${class}::${sub}"; + @result = (&$fssub(@$params)); + }; + + if ($@) { + warn "FS::XMLRPC: Error while calling '${fssub}': $@"; + return []; + } + } warn Dumper(@result);