From 7767ca52fd3d71ebd58fd584edeced8241e64f35 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Mon, 20 Apr 2020 17:31:19 +0200
Subject: [PATCH] pmgpolicy: greylist_value: improve indentation of statements

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 src/bin/pmgpolicy | 48 +++++++++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/src/bin/pmgpolicy b/src/bin/pmgpolicy
index fd78ced..9c27947 100755
--- a/src/bin/pmgpolicy
+++ b/src/bin/pmgpolicy
@@ -685,9 +685,11 @@ sub greylist_value {
 
 	if (!defined($ref->{rctime})) {
 
-	    $dbh->do(PMG::DBTools::cgreylist_merge_sql(1), undef,
-		    $ip, $masklen, 0, $sender, $rcpt, $instance,
-		    $ctime, $ctime + $greylist_lifetime, 0, 1, 0, $ctime, $self->{lcid});
+	    $dbh->do(
+		PMG::DBTools::cgreylist_merge_sql(1), undef, $ip, $masklen,
+		0, $sender, $rcpt, $instance, $ctime, $ctime + $greylist_lifetime,
+		0, 1, 0, $ctime, $self->{lcid}
+	    );
 
 	    $res = $defer_res;
 	    $self->log(3, "defer greylisted mail");
@@ -698,31 +700,37 @@ sub greylist_value {
 		# defer (resent within greylist_delay window)
 		$res = $defer_res;
 		$self->log(3, "defer greylisted mail");
-		$dbh->do("UPDATE CGreylist " .
-			"SET Blocked = Blocked + 1, MTime = ? " .
-			"WHERE IPNet::cidr = network(set_masklen(?, ?)) AND ".
-			"Sender = ? AND Receiver = ?", undef,
-			$ctime, $ip, $masklen, $sender, $rcpt);
+		$dbh->do(
+		    "UPDATE CGreylist " .
+		    "SET Blocked = Blocked + 1, MTime = ? " .
+		    "WHERE IPNet::cidr = network(set_masklen(?, ?)) ".
+		    " AND Sender = ? AND Receiver = ?", undef,
+		    $ctime, $ip, $masklen, $sender, $rcpt
+		);
 	    } else {
 		if ($ctime < $ref->{extime}) {
 		    # accept (not expired)
 		    my $lifetime = $sender eq "" ? 0 : $greylist_awlifetime;
 		    my $delay = $ref->{passed} ? "" : "Delay = $age, ";
-		    $dbh->do("UPDATE CGreylist " .
-			    "SET Passed = Passed + 1, $delay ExTime = ?, MTime = ? " .
-			    "WHERE IPNet::cidr = network(set_masklen(?, ?)) AND ".
-			    "Sender = ? AND Receiver = ?", undef,
-			    $ctime + $lifetime, $ctime, $ip, $masklen, $sender, $rcpt);
+		    $dbh->do(
+			"UPDATE CGreylist " .
+			"SET Passed = Passed + 1, $delay ExTime = ?, MTime = ? " .
+			"WHERE IPNet::cidr = network(set_masklen(?, ?)) ".
+			" AND Sender = ? AND Receiver = ?", undef,
+			$ctime + $lifetime, $ctime, $ip, $masklen, $sender, $rcpt
+		    );
 		} else {
 		    # defer (record is expired)
 		    $res = $defer_res;
-		    $dbh->do("UPDATE CGreylist " .
-			    "SET RCTime = ?, ExTime = ?, MTime = ?, Instance = ?, " .
-			    "Blocked = 1, Passed = 0 " .
-			    "WHERE IPNet::cidr = network(set_masklen(?, ?)) AND ".
-			    "Sender = ? AND Receiver = ?", undef,
-			    $ctime, $ctime + $greylist_lifetime, $ctime, $instance,
-			    $ip, $masklen, $sender, $rcpt);
+		    $dbh->do(
+			"UPDATE CGreylist " .
+			"SET RCTime = ?, ExTime = ?, MTime = ?, Instance = ?, " .
+			"Blocked = 1, Passed = 0 " .
+			"WHERE IPNet::cidr = network(set_masklen(?, ?)) ".
+			" AND Sender = ? AND Receiver = ?", undef,
+			$ctime, $ctime + $greylist_lifetime, $ctime, $instance,
+			$ip, $masklen, $sender, $rcpt
+		    );
 		}
 	    }
 	}
-- 
2.39.2