svn commit: r165051 - /spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm

[qu...@apache.org]

Author: quinlan
Date: Wed Apr 27 14:15:38 2005
New Revision: 165051

URL: http://svn.apache.org/viewcvs?rev=165051&view=rev
Log:
whitespace changes only

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm
URL: http://svn.apache.org/viewcvs/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm?rev=165051&r1=165050&r2=165051&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/SQL.pm Wed Apr 27 14:15:38 2005
@@ -90,7 +90,7 @@
    my ($self, $username) = @_;
 
    my $dsn = $self->{main}->{conf}->{user_scores_dsn};
-   if(!defined($dsn) || $dsn eq '') {
+   if (!defined($dsn) || $dsn eq '') {
      dbg("config: no DSN defined; skipping sql");
      return 1;
    }
@@ -124,12 +124,12 @@
 
    my $dbh = DBI->connect($dsn, $dbuser, $dbpass, {'PrintError' => 0});
 
-   if($dbh) {
+   if ($dbh) {
      my $sql;
      if (defined($custom_query)) {
        $sql = $custom_query;
        my $quoted_username = $dbh->quote($username);
-       my ($mailbox, $domain) = split('@',$username);
+       my ($mailbox, $domain) = split('@', $username);
        my $quoted_mailbox = $dbh->quote($mailbox);
        my $quoted_domain = $dbh->quote($domain);
 
@@ -144,26 +144,36 @@
         " or $f_username = '\@GLOBAL' order by $f_username asc";
      }
      dbg("config: Conf::SQL: executing SQL: $sql");
-      my $sth = $dbh->prepare($sql);
-      if($sth) {
-         my $rv  = $sth->execute();
-         if($rv) {
-            dbg("config: retrieving prefs for $username from SQL server");
-            my @row;
-            my $text = '';
-            while(@row = $sth->fetchrow_array()) {
-               $text .= (defined($row[0]) ? $row[0] : '') . "\t" . (defined($row[1]) ? $row[1] : '')  . "\n";
-            }
-            if($text ne '') {
-	      $main->{conf}->{main} = $main;
-	      $main->{conf}->parse_scores_only(join('',$text));
-	      delete $main->{conf}->{main};
-            }
-            $sth->finish();
-         } else { die "config: SQL error: $sql\n".$sth->errstr."\n"; }
-      } else { die "config: SQL error: " . $dbh->errstr . "\n"; }
-   $dbh->disconnect();
-   } else { die "config: SQL error: " . DBI->errstr . "\n"; }
+     my $sth = $dbh->prepare($sql);
+     if ($sth) {
+       my $rv  = $sth->execute();
+       if ($rv) {
+	 dbg("config: retrieving prefs for $username from SQL server");
+	 my @row;
+	 my $text = '';
+	 while (@row = $sth->fetchrow_array()) {
+	   $text .= (defined($row[0]) ? $row[0] : '') . "\t" .
+	       (defined($row[1]) ? $row[1] : '')  . "\n";
+	 }
+	 if ($text ne '') {
+	   $main->{conf}->{main} = $main;
+	   $main->{conf}->parse_scores_only(join('', $text));
+	   delete $main->{conf}->{main};
+	 }
+	 $sth->finish();
+       }
+       else {
+	 die "config: SQL error: $sql\n".$sth->errstr."\n";
+       }
+     }
+     else {
+       die "config: SQL error: " . $dbh->errstr . "\n";
+     }
+     $dbh->disconnect();
+   }
+   else {
+     die "config: SQL error: " . DBI->errstr . "\n";
+   }
 }
 
 ###########################################################################