[freeside-commits] freeside/FS/FS/part_export acct_sql_status.pm, 1.1.2.5, 1.1.2.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/part_export
In directory wavetail.420.am:/tmp/cvs-serv17175/FS/FS/part_export

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	acct_sql_status.pm 
Log Message:
display spam status on account view, RT#15987

Index: acct_sql_status.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_export/acct_sql_status.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -w -d -r1.1.2.5 -r1.1.2.6
--- acct_sql_status.pm	15 Jan 2012 04:22:50 -0000	1.1.2.5
+++ acct_sql_status.pm	15 Jan 2012 05:28:05 -0000	1.1.2.6
@@ -33,16 +33,16 @@
   my($self, $svc_acct, $htmlref, $hashref) = @_;
 
   my $dbh = DBI->connect( map $self->option($_), qw(datasrc username password) )
-    or do { $hashref->{'error'} = "can't connect: ".  $DBI::errstr; return; };
+    or return "can't connect: ".  $DBI::errstr;
 
   ###
   #vacation settings
   ###
 
   my $vsth = $dbh->prepare('SELECT * FROM vacation WHERE email = ?')
-    or do { $hashref->{'error'} = "can't prepare: ". $dbh->errstr; return; };
+    or return "can't prepare: ". $dbh->errstr;
   $vsth->execute( $svc_acct->email )
-    or do { $hashref->{'error'} = "can't execute: ". $vsth->errstr; return; };
+    or return "can't execute: ". $vsth->errstr;
 
   my $vrow = $vsth->fetchrow_hashref;
   if ( $vrow ) {
@@ -60,9 +60,9 @@
   ###
 
   my $ssth = $dbh->prepare('SELECT * FROM users WHERE address = ?')
-    or do { $hashref->{'error'} = "can't prepare: ". $dbh->errstr; return; };
+    or return "can't prepare: ". $dbh->errstr;
   $ssth->execute( $svc_acct->email )
-    or do { $hashref->{'error'} = "can't execute: ". $ssth->errstr; return; };
+    or return "can't execute: ". $ssth->errstr;
 
   my $srow = $ssth->fetchrow_hashref;
   if ( $srow ) {
@@ -81,6 +81,9 @@
 
   #htmlref not implemented/used for this status export
 
+
+  ''; #no errors
+
 }
 
 1;