diff options
author | Ivan Kohler <ivan@freeside.biz> | 2012-12-04 12:15:28 -0800 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2012-12-04 12:15:28 -0800 |
commit | 1a6848f49af5bed28f7a73c747ce18d8bbe2f31e (patch) | |
tree | 2cbe765f11b88d565e8012a6b4d1acf556b301a6 /FS/FS/part_export | |
parent | a9e018d378fd83aadf4c84a33001e39333c7cd30 (diff) |
add $email to acct_xmlrpc export, RT#17622
Diffstat (limited to 'FS/FS/part_export')
-rw-r--r-- | FS/FS/part_export/acct_xmlrpc.pm | 7 |
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 4c896b4..a493f52 100644 --- a/FS/FS/part_export/acct_xmlrpc.pm +++ b/FS/FS/part_export/acct_xmlrpc.pm @@ -48,6 +48,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") @@ -196,8 +198,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' ) { @@ -207,6 +209,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'; |