[freeside-commits] branch master updated. 1a6848f49af5bed28f7a73c747ce18d8bbe2f31e

[Ivan]

The branch, master has been updated
       via  1a6848f49af5bed28f7a73c747ce18d8bbe2f31e (commit)
      from  a9e018d378fd83aadf4c84a33001e39333c7cd30 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1a6848f49af5bed28f7a73c747ce18d8bbe2f31e
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 4 12:15:28 2012 -0800

    add $email to acct_xmlrpc export, RT#17622

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 at 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';

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/acct_xmlrpc.pm |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)