summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2012-12-04 12:15:31 -0800
committerIvan Kohler <ivan@freeside.biz>2012-12-04 12:15:31 -0800
commit48df303c25948bcc07dbebbec09749d5c4682594 (patch)
treea8d7ee976b142f13d76510ad5bd482da2e8c100b
parentf23f61c98576a960011056cfb827424791af3b40 (diff)
add $email to acct_xmlrpc export, RT#17622
-rw-r--r--FS/FS/part_export/acct_xmlrpc.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/FS/FS/part_export/acct_xmlrpc.pm b/FS/FS/part_export/acct_xmlrpc.pm
index 7f0763b98..c7b1a3fb1 100644
--- a/FS/FS/part_export/acct_xmlrpc.pm
+++ b/FS/FS/part_export/acct_xmlrpc.pm
@@ -47,6 +47,8 @@ The following variables are available for interpolation (prefixed with new_ or
old_ for replace operations):
<UL>
<LI><code>$username</code>
+ <LI><code>$domain</code>
+ <LI><code>$email</code> - username@domain
<LI><code>$_password</code>
<LI><code>$crypt_password</code> - encrypted password
<LI><code>$ldap_password</code> - Password in LDAP/RFC2307 format (for example, "{PLAIN}himom", "{CRYPT}94pAVyK/4oIBk" or "{MD5}5426824942db4253f87a1009fd5d2d4")
@@ -195,8 +197,8 @@ sub _export_value {
} else {
return Frontier::RPC2::String->new( $svc_acct->$value() );
}
- } elsif ( $value eq 'domain' ) {
- return Frontier::RPC2::String->new( $svc_acct->domain );
+ } elsif ( $value =~ /^(domain|email)$/ ) {
+ return Frontier::RPC2::String->new( $svc_acct->$value() );
} elsif ( $value eq 'crypt_password' ) {
return Frontier::RPC2::String->new( $svc_acct->crypt_password( $self->option('crypt') ) );
} elsif ( $value eq 'ldap_password' ) {
@@ -206,6 +208,7 @@ sub _export_value {
#XXX
}
+#this is the "cust_main" email, not svc_acct->email
# my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
# if ( $cust_pkg ) {
# no strict 'vars';