[freeside-commits] freeside/httemplate/edit svc_acct.cgi, 1.69.2.1, 1.69.2.2

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/httemplate/edit
In directory wavetail.420.am:/tmp/cvs-serv27569/httemplate/edit

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	svc_acct.cgi 
Log Message:
better error handling in google export, #12064

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/edit/svc_acct.cgi,v
retrieving revision 1.69.2.1
retrieving revision 1.69.2.2
diff -u -w -d -r1.69.2.1 -r1.69.2.2
--- svc_acct.cgi	16 Mar 2011 02:06:01 -0000	1.69.2.1
+++ svc_acct.cgi	30 Apr 2011 21:22:55 -0000	1.69.2.2
@@ -494,7 +494,15 @@
 my $captcha_url;
 my ($export_google) = $part_svc->part_export('acct_google');
 if ( $export_google ) {
-  $captcha_url = $export_google->captcha_url || '';
+  my $error = $export_google->auth_error;
+  if ( $error ) {
+    if ( $error->{'captcha_url'} ) {
+      $captcha_url = $error->{'captcha_url'};
+    }
+    else {
+      $cgi->param('error', $error->{'message'});
+    }
+  } #if $error
 }
 
 </%init>