falon / RBL

contrib/mailClassifier/index.php

Braces +2 added lines, -1 removed lines

@@ -26,8 +26,9 @@
 $user = username();
 $isAdmin = in_array($user,array_keys($admins));
 $canChange = ($isAdmin) ? '' : 'readonly';
-if ( $require_auth )
+if ( $require_auth ) {
 	if ( $user == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+}
 
 
 print <<<END

contrib/mailClassifier/list.php

Braces +4 added lines, -3 removed lines

@@ -14,11 +14,12 @@
 $folders=imapFolder($conf['imap'], $_POST['username']);
 if (is_array($folders)) {
 	print '<option  value="" selected disabled>Choose a folder</option>';
-	foreach ( $folders as $folder )
-        	printf('<option  value="%s">%s</option>',
+	foreach ( $folders as $folder ) {
+	        	printf('<option  value="%s">%s</option>',
 			$folder,
 			htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP")));
-}
+	}
+	}
 closelog();
 ?>
 </select>

result.php

Braces +28 added lines, -16 removed lines

@@ -5,32 +5,39 @@ 
 $net = new \dautkom\ipv4\IPv4();
 
 $_ = $_POST['genere'];
-if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') ) {
         if (!(isValid($_POST['Value'])))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid IP address.</pre>');
+}
 	
 if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) {
 	$value = explode('/',$_POST['Value']);
-	if (count($value) != 2)
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
-	if (!$net->address($value[0])->mask($value[1])->isValid(1))
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
+	if (count($value) != 2) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
+	}
+	if (!$net->address($value[0])->mask($value[1])->isValid(1)) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
+	}
 	$_POST['Value'] = $value[0].'/'.$net->mask($value[1])->convertTo('dec');
 }
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
-	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
-		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) ) {
+                        exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+        }
+	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) ) {
+			exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+	}
 	switch ( $_POST['Value'] ) {
 		case 'anonymous':
 		case 'anybody':
@@ -41,18 +48,23 @@ 
 }	
 
 if (empty($_GET)) {
-	if ($tables["$_"]['milter']) print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
-	else {
-		if ($tables["$_"]['bl']) print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
-		else                     print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
+	if ($tables["$_"]['milter']) {
+		print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
+	} else {
+		if ($tables["$_"]['bl']) {
+			print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
+		} else {
+			print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
+		}
 	}
 }
 
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE ) {
 	exit ('Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 	
 rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
 $mysqli->close();

contrib/ipImap/function.php

Braces +127 added lines, -79 removed lines

@@ -10,21 +10,25 @@ 
 	if ( preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m',$header,$received) ) {
 		for ($i = count($received[0])-1;$i>=0;$i--) {
 #			print "Examine ".$received[0][$i]."\n";
-			if ( preg_match($msa,$received['host'][$i]) )
-				$dateR = $received['date'][$i];
+			if ( preg_match($msa,$received['host'][$i]) ) {
+							$dateR = $received['date'][$i];
+			}
         		foreach ($mxserver as $mx) {
-        			if (!$ip)
-					if ($mx == $received['host'][$i]) {
+        			if (!$ip) {
+        								if ($mx == $received['host'][$i]) {
 						$host = $received['host'][$i];
+        			}
 						$ip = $received['ip'][$i];
                     			}
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
-		$dateC['date'] = 'Not found';
-	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1)
-		$mid['mid'] = NULL;
+	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1) {
+			$dateC['date'] = 'Not found';
+	}
+	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1) {
+			$mid['mid'] = NULL;
+	}
 	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
 }
 
@@ -40,7 +44,9 @@ 
 
 function summaryBadReport ($uidvet) {
         $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
+        if ( empty($uidvet) ) {
+        	return NULL;
+        }
         $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
 
         /* Remove count index */
@@ -75,8 +81,12 @@ 
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
             $k = substr($k,1);
-            if (!isset($ret[$k])) $ret[$k] = $array[$k];
-            if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
+            if (!isset($ret[$k])) {
+            	$ret[$k] = $array[$k];
+            }
+            if (isset ($array[$k][$col])) {
+            	$ret[$k][$col] = $array[$k][$col];
+            }
         }
     }
     return $ret;
@@ -87,14 +97,18 @@ 
 function summaryReportAndList ($cf,$myconn,$tables,$category,$vet,$key) {
 	$nk = $vet['count'];
 
-	if ( empty($vet) ) return NULL;
+	if ( empty($vet) ) {
+		return NULL;
+	}
 	
 	$return = sprintf('<h3>Statistics by %s</h3><table><tr><th>%s</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this %s is currently listed, but it says if this %s has listed now!">Listed Now</th></tr>'."\n", strtoupper($key),strtoupper($key),$key,$key);
 	
 	$values = array_keys($vet["$key"]);
 
 	foreach ( $values as $value ) {
-		if ( $value == 'count' ) continue;
+		if ( $value == 'count' ) {
+			continue;
+		}
                 $nlearn = $vet["$key"]["$value"]['count'];
                 unset($vet["$key"]["$value"]['count']);
 		$quantity = $cf["listing$key"]['quantity']["$category"]; /* In searchAndList this value is
@@ -106,10 +120,12 @@ 
 				'The %s <%s> has been listed because was marked %u times as %s by %u different accounts during last %u days.',
 				strtoupper($key),$value,$nlearn,$category,$nuid,$cf['imap']['oldestday']);
 				$listed = searchAndList ($myconn,$cf['syslog']['user'],$tables,$cf["listing$key"]['list']["$category"],$value,$cf["listing$key"]['unit']["$category"],$quantity,$reason);
+			} else {
+				$listed = FALSE;
 			}
-			else $listed = FALSE;
+		} else {
+			$listed = FALSE;
 		}
-		else $listed = FALSE;
 		$nowlist = array( TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
@@ -127,7 +143,9 @@ 
 		$return .='<tr><td rowspan="'.$nuid.'">'.$value.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$vet["$key"]["$value"][0],$nlearn,$nowlist["$listed"]['name']);
 		$rowuid=NULL;
-                for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nuid;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
 		array_shift($vet["$key"]["$value"]);
                 $return .= vsprintf ($rowuid,$vet["$key"]["$value"]);
 
@@ -140,14 +158,18 @@ 
 	$return .= sprintf('<h3>Statistics by UID</h3><table><tr><th>UID</th><th>%s learned</th><th>Learned times</th></tr>'."\n",$key);
 	$uids = array_keys($vet['uid']);
         foreach ( $uids as $uid ) {
-		if ( $uid == 'count' ) continue;	
+		if ( $uid == 'count' ) {
+			continue;
+		}
 	        $nlearn = $vet['uid']["$uid"]['count'];
 	        unset ( $vet['uid']["$uid"]['count'] );
 		$nip = count($vet['uid']["$uid"]);
 		$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$vet['uid']["$uid"][0],$nlearn);
                 $rowuid=NULL;
-                for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nip;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
                 array_shift($vet['uid']["$uid"]);
                 $return .= vsprintf ($rowuid,$vet['uid']["$uid"]);
 
@@ -197,14 +219,14 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
-	    }
-	    else if ($result instanceof Splunk_ResultsMessage)
+	      if ( count($result->getFieldNames()) > 1 ) {
+	      	return FALSE;
+	      }
+	    } else if ($result instanceof Splunk_ResultsMessage)
 	    {
 	      // I don't want messages in my search
 	      return FALSE;
-	    }
-	    else if (is_array($result))
+	    } else if (is_array($result))
 	    {
 	      // Process a row
 	      foreach ($result as $key => $valueOrValues)
@@ -212,15 +234,13 @@ 
 	         if (is_array($valueOrValues))
 	          {
 	            return FALSE;
-	          }
-	         else
+	          } else
 	          {
 	            return $valueOrValues;
 	            #print "  {$key} => {$value}\r\n";
 	          }
 	        }
-	    }
-	    else
+	    } else
 	    {
 	      #print "Unknow result type";
 	      return FALSE;
@@ -240,11 +260,9 @@ 
                 if(isset($part->parts)) {
                         if($part->type == 2) {
                                 $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.', 0, false);
-                        }
-                        elseif($fullPrefix) {
+                        } elseif($fullPrefix) {
                                 $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.');
-                        }
-                        else {
+                        } else {
                                 $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix);
                         }
                         unset($flattenedParts[$prefix.$index]->parts);
@@ -281,8 +299,9 @@ 
 	if ( ($num_found !== FALSE) && ($num_found>0) ) {
 		foreach ($out[0] as $url) {
 			$dom=nsdom(parse_url($url, PHP_URL_HOST));
-			if (!( empty($dom) || in_array($dom,$exclude) ))
-				$ret[] = $dom;
+			if (!( empty($dom) || in_array($dom,$exclude) )) {
+							$ret[] = $dom;
+			}
 		}
 	}
 	return array_values(array_unique($ret));
@@ -320,12 +339,13 @@ 
 			}
 	
 		}
+	} else {
+			$message = getPart($connection, $messageNumber, 1, $structure->encoding);
 	}
-	else
-		$message = getPart($connection, $messageNumber, 1, $structure->encoding);
 
-	if ( !empty($message) )
-		return getDomains($message, $exclusionList);
+	if ( !empty($message) ) {
+			return getDomains($message, $exclusionList);
+	}
 	return array();
 }
 
@@ -360,7 +380,9 @@ 
 	$fileb= dirname(__FILE__) . '/' . $cf['report']['badreportFile']["$type"];
 	$m_mail = imap_open('{'.$cf['imap']['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['imap']['authuser'].'}'.$cf['imap']['folder']["$type"], $cf['imap']['account'],$cf['imap']['authpassword'], OP_READONLY)
         	or syslog (LOG_EMERG, $cf['syslog']['user'].': Error in IMAP connection to <'.$cf['imap']['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+	if ( !$m_mail ) {
+		exit(254);
+	}
 		
 
 	syslog (LOG_INFO,$cf['syslog']['user'].': Successfully connected to <'.$cf['imap']['mailhost'].">; Reading $type messages of last ".$cf['imap']['oldestday'].' days...');
@@ -372,21 +394,31 @@ 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['syslog']['user'].": No mail found in $type folder. No reports written for $type.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
+	        if ( $ierr = imap_errors() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
+	        }
+	        if ( $ierr = imap_alerts() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
+	        }
 		imap_close( $m_mail );
-		if ( file_exists( $file ) ) unlink ($file);
-		if ( file_exists( $filed ) ) unlink ($filed);
-		if ( file_exists( $fileb ) ) unlink ($fileb);
+		if ( file_exists( $file ) ) {
+			unlink ($file);
+		}
+		if ( file_exists( $filed ) ) {
+			unlink ($filed);
+		}
+		if ( file_exists( $fileb ) ) {
+			unlink ($fileb);
+		}
 		return FALSE;
 	}
 	$nmes = count ($m_search);
 	syslog (LOG_INFO,$cf['syslog']['user'].": Found $nmes mail in $type folder.");
-	if ($nmes>0) rsort($m_search);
+	if ($nmes>0) {
+		rsort($m_search);
+	}
 
 	// Create report file
 
@@ -450,10 +482,11 @@ 
 
 	                if (in_array($uid,array_keys($ipuid['uid']))) {
 				$ipuid['uid']["$uid"]['count']++;		//number of learn by this uid
-				if (!in_array($ip,$ipuid['uid']["$uid"])) 
-					$ipuid['uid']["$uid"][]=$ip;		//ips learned by this uid
-			}
-			else {
+				if (!in_array($ip,$ipuid['uid']["$uid"])) {
+									$ipuid['uid']["$uid"][]=$ip;
+				}
+				//ips learned by this uid
+			} else {
 				$ipuid['uid']["$uid"]['count'] = 1;
 				$ipuid['uid']["$uid"][]=$ip;
 				$ipuid['uid']['count']++;                	//number of unique uids
@@ -461,10 +494,11 @@ 
 
                         if (in_array($ip,array_keys($ipuid['ip']))) {
                                 $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
-				if (!in_array($uid,$ipuid['ip']["$ip"]))
-					$ipuid['ip']["$ip"][]=$uid;		//uids that learned this ip
-			}
-                        else {
+				if (!in_array($uid,$ipuid['ip']["$ip"])) {
+									$ipuid['ip']["$ip"][]=$uid;
+				}
+				//uids that learned this ip
+			} else {
                                 $ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
@@ -474,10 +508,11 @@ 
 				$domuid['count']++;
 				if (in_array($uid,array_keys($domuid['uid']))) {
 					$domuid['uid']["$uid"]['count']++;               //number of learn by this uid
-					if (!in_array($dom,$domuid['uid']["$uid"]))
-						$domuid['uid']["$uid"][]=$dom;		//domains learned by this uid
-				}
-				else {
+					if (!in_array($dom,$domuid['uid']["$uid"])) {
+											$domuid['uid']["$uid"][]=$dom;
+					}
+					//domains learned by this uid
+				} else {
 					$domuid['uid']["$uid"]['count'] = 1;
 					$domuid['uid']["$uid"][]=$dom;
 					$domuid['uid']['count']++;			//number of unique uids
@@ -485,10 +520,11 @@ 
 
 				if (in_array($dom,array_keys($domuid['dom']))) {
 					$domuid['dom']["$dom"]['count']++;	//number of learn with this domain
-					if (!in_array($uid,$domuid['dom']["$dom"]))
-						$domuid['dom']["$dom"][]=$uid;	//uids that learned this domain
-				}
-				else {
+					if (!in_array($uid,$domuid['dom']["$dom"])) {
+											$domuid['dom']["$dom"][]=$uid;
+					}
+					//uids that learned this domain
+				} else {
 					$domuid['dom']["$dom"]['count'] = 1;
 					$domuid['dom']["$dom"][]=$uid;
 					$domuid['dom']['count']++;		//number of unique domains
@@ -505,21 +541,30 @@ 
 
 	        	/* Update HTML report */
 	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
-		}
-	        else {	/* Bad learn */
+		} else {	/* Bad learn */
 			
-                        if (in_array($uid,array_keys($uidbad['uid']))) 
-                                $uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
+                        if (in_array($uid,array_keys($uidbad['uid']))) {
+                                                        $uidbad['uid']["$uid"]['count']++;
+                        }
+                        //number of bad learn by this uid
                         else {
                                 $uidbad['uid']["$uid"]['count'] = 1;
 				$uidbad['uid']["$uid"][]=$uid;
                                 $uidbad['count']++;                       //numeber of unique bad uids
                         }
 			/* The reason of bad report */
-			if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
-			if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
-			if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log';
-			if (!isset($reason)) $reason = '?';
+			if ($host === FALSE) {
+				$reason = 'This mail was not received by recognized MX host';
+			}
+			if ($dateReceived === FALSE) {
+				$reason = 'This mail was not submitted to recognized MSA for learn';
+			}
+			if ($uid=='unknown') {
+				$reason = 'The uid of this mail was not found in splunk log';
+			}
+			if (!isset($reason)) {
+				$reason = '?';
+			}
 				
 			fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) );
 		}
@@ -541,9 +586,9 @@ 
 	fwrite($fpd, '<hr><h2>Summary Report</h2><h5>Listing policy: domains must be learned at least '.$cf['listingdom']['threshold']["$type"].' times from at least '.$cf['listingdom']['thresholduid']["$type"].' different valid uids.</h5>' );
 
         /* Make MYSQL connection */
-	if ( $cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"] )
-		$mysqli = NULL;
-	else {
+	if ( $cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"] ) {
+			$mysqli = NULL;
+	} else {
         	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
         	if ($mysqli->connect_error) {
                 	syslog (LOG_EMERG, $cf['syslog']['user'].': Connect Error (' . $mysqli->connect_errno . ') '
@@ -562,8 +607,9 @@ 
 	fwrite($fpd,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter']));
 	fclose($fpd);
 	
-	if ( !($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]) )
-		$mysqli->close();
+	if ( !($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]) ) {
+			$mysqli->close();
+	}
 
 	fwrite($fpb, '</table>');
 	fwrite( $fpb,summaryBadReport( $uidbad ) );
@@ -571,12 +617,14 @@ 
 	fclose($fpb);
 	syslog (LOG_INFO,$cf['syslog']['user'].': Report files written. Listing job for '.$type.' terminated.');
 
-	if ( $ierr = imap_errors() )
-		foreach ( $ierr as $thiserr )
+	if ( $ierr = imap_errors() ) {
+			foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr");
-	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
+	}
+	if ( $ierr = imap_alerts() ) {
+	                foreach ( $ierr as $thiserr )
                         syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
+	}
 	imap_close($m_mail);
 }
 ?>

function.php

Braces +152 added lines, -103 removed lines

@@ -3,22 +3,27 @@ 
 ini_set('error_log', 'syslog');
 
 function username() {
-	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+	if (isset ($_SERVER['REMOTE_USER'])) {
+		$user = $_SERVER['REMOTE_USER'];
+	} else if (isset ($_SERVER['USER'])) {
+        		$user = $_SERVER['USER'];
+        	} else {
+                		$user='unknown';
+                	}
 	return $user;
 }
 
 function checkSSL() {
-	if ( empty( $_SERVER['HTTPS'] ) )
-		printf ('<div id="content">Ehi sysadmin! Your site is not secure. Please enable SSL on your server and configure a redirect, such as' .
+	if ( empty( $_SERVER['HTTPS'] ) ) {
+			printf ('<div id="content">Ehi sysadmin! Your site is not secure. Please enable SSL on your server and configure a redirect, such as' .
 			'<pre>' .
 			htmlspecialchars('<VirtualHost *:80>' . "\n" .
 			'  ServerName %s' . "\n" .
 			'  Redirect permanent / https://%s/' . "\n" .
 			'</VirtualHost>') .
 			'</pre></div>', gethostname(), gethostname());
-}
+	}
+	}
 
 function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
         $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
@@ -99,8 +104,9 @@ 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
 	    $result=TRUE;
+	} else {
+		syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	}
-	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
@@ -110,8 +116,7 @@ 
 	if ( $exptime ) { /* Entry already listed */
 		$nlist = '`nlist`';
 		$exptime = sprintf('\'%s\'', $exptime);  /* Eh MySQL... an hour lost to notice this */
-	}
-	else {
+	} else {
 		$exptime = 'CURRENT_TIMESTAMP';
 		$nlist = '`nlist` + 1';
 	}
@@ -149,8 +154,9 @@ 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit from $exptime.");
 		$result=TRUE;
+        } else {
+        	syslog (LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
@@ -173,9 +179,11 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        if ($return=$myconn->query($query) === TRUE) {
+                    syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        }
 
         return $return;
 }
@@ -197,8 +205,9 @@ 
 
         if ($return=$myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
@@ -222,14 +231,16 @@ 
 				$j++;
 
 			} while ($myconn->next_result());
-		}
-		else {
+		} else {
 			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
-	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	if ( !($return) ) {
+		syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	} else {
+		syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	}
         return $return;
 }
 
@@ -238,8 +249,11 @@ 
 
 	$exp=new DateTime($row['exp']);
 	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
-	else return false;
+	if (($exp > $now) and ($row['active'])) {
+		return true;
+	} else {
+		return false;
+	}
 
 }
 
@@ -259,10 +273,11 @@ 
 END;
 		$activeMilts = explode(',',$value);
 		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
-			else
-				$selected= NULL;
+			if ( in_array($milter, $activeMilts) ) {
+							$selected= 'selected';
+			} else {
+							$selected= NULL;
+			}
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -279,9 +294,12 @@ 
 	$whynot=NULL;
 	switch ($what) {
 		case 'Ok':
-			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if ($lock) {
+				return NULL;
+			}
+			if (in_array($user,array_keys($adm))) {
+							if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			}
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -293,7 +311,9 @@ 
 function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (! isset($alltables["$typed"]['depend']) ) {
+		return TRUE;
+	}
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
 		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
@@ -324,10 +344,10 @@ 
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
-		if ($value == 'ALL')
-			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
+		if ($value == 'ALL') {
+					$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
 				$table,$table);
-		else {
+		} else {
 			switch ($type) {
 				case 'network':
 					list($sub['net'],$sub['mask'])=explode('/',$value);
@@ -352,12 +372,11 @@ 
 					return FALSE;
 			}
 		}
-	}
-
-	else {
+	} else {
 	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
+	        if ($value == 'ALL') {
+	        	$query = 'select * from '.$table;
+	        } else {
 	                switch ($type) {
 	                  case 'ip':
 	                        $query= "select * from $table where $type =  INET_ATON('$value')";
@@ -379,8 +398,9 @@ 
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
-		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	if($result === false) {
+			syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	}
         return $result;
 }
 
@@ -397,12 +417,14 @@ 
 
 function isFull($myconn,$typedesc,$alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
-			$tab = 'net';
-		else
-			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
+		if ( $alltables["$typedesc"]['milter'] ) {
+					$tab = 'net';
+		} else {
+					$tab = $alltables["$typedesc"]['name'];
+		}
+                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) {
+                                        return TRUE;
+                }
         }
 	return FALSE;
 }
@@ -415,14 +437,17 @@ 
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
-		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	if ( $tables["$typedesc"]['milter'] ) {
+			$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	}
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
-	if ($type == 'domain')
-		$value = nsdom($value);
-	if (is_null($value))
-		return FALSE;
+	if ($type == 'domain') {
+			$value = nsdom($value);
+	}
+	if (is_null($value)) {
+			return FALSE;
+	}
 
 	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
 	if ($result) {
@@ -430,18 +455,23 @@ 
 
         /* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
-	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	if ($full) {
+		print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	}
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
-				}	
-				else
-					$listed='Ok';
+					if ($tables["$typedesc"]['bl']) {
+						$listed='Listed';
+					} else {
+						$listed='WhiteListed';
+					}
+				} else {
+									$listed='Ok';
+				}
 
 				switch ($type) {
 				  case 'ip':
@@ -454,27 +484,30 @@ 
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) ) {
+									printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
-				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				} else {
+									 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				}
 				$i++;
         		}
 			print '</tbody></table>';
-		}
-		else {
+		} else {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
-									else print '<p>'.htmlspecialchars($whynot).'</p>';
+			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') ) {
+							if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			} else {
+										print '<p>'.htmlspecialchars($whynot).'</p>';
+									}
 				
 		}
 		$result->free();
+	} else {
+		print '<pre>Query error or something wrong in DB schema'."\n</pre>";
+	}
 	}
-	else print '<pre>Query error or something wrong in DB schema'."\n</pre>";
-}
 
 
 
@@ -517,24 +550,32 @@ 
                 $old_mailfrom = ini_get("sendmail_from");
                 ini_set("sendmail_from", $from);
                 $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to,$sbj, $body,$headers,$params))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
+                if (isset($old_mailfrom)) {
+                                        ini_set("sendmail_from", $old_mailfrom);
+                }
+        } else {
+                if (!(mail($to,$sbj, $body,$headers))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
         }
         return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
-		return $ini_array["$dom"];
-	else return FALSE;
-}
+	if (in_array($dom,array_keys($ini_array))) {
+			return $ini_array["$dom"];
+	} else {
+		return FALSE;
+	}
+	}
 
 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,&$reason) {
@@ -582,8 +623,7 @@ 
 					 $reason);
 				$quantity = 1;
 				$unit = 'DAY';
-                        }
-			else {
+                        } else {
                         	/* Entry delisted */
 				$quantity *= $thisentry['nlist'];
 				$expdate = 0; /* This forces expiration from CURRENT_TIMESTAMP */
@@ -614,9 +654,10 @@ 
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ( $ips as $ip ) {
+			if ( $net->address($addressB)->mask($maskB)->has($ip) )
 			return TRUE;
+	}
 	return FALSE;
 }
 
@@ -693,8 +734,9 @@ 
 		return FALSE;
 	}
 	if ($result->num_rows) {
-		while ($milt = $result->fetch_array(MYSQLI_ASSOC))
-			$milters[] = $milt['name'];
+		while ($milt = $result->fetch_array(MYSQLI_ASSOC)) {
+					$milters[] = $milt['name'];
+		}
 	}
 	$result->free();
 	return $milters;
@@ -720,12 +762,14 @@ 
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if ( count($query) ) {
+		/* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
 						`datemod`= CURRENT_TIMESTAMP
 					 WHERE `idmilt`=%d', $table, $loguser, $miltID);
+	}
 
 
 	/* Start a safe transaction: it commits only if all queries happen */
@@ -739,19 +783,20 @@ 
 		}
 	}
 	if ( $ok ) {
-		if ( $myconn->commit() )
-			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
-		else {
+		if ( $myconn->commit() ) {
+					syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
+		} else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
-				syslog(LOG_INFO, "$loguser: rollback succeeded.");
-			else
-				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			if ( $myconn->rollback() ) {
+							syslog(LOG_INFO, "$loguser: rollback succeeded.");
+			} else {
+							syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			}
 			$ok = FALSE;
 		}
+	} else {
+			syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	}
-	else
-		syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	return $ok;
 		
 }
@@ -780,20 +825,24 @@ 
 function nsdom($dom) {
 /* Return the first lowercase upper domain (or domain itself) with NS record */
 /* checkdnsrr doesn't work with alias... use dns_get_record */
-	if (dns_get_record ( $dom , DNS_NS ))
-		return strtolower(rtrim($dom, '.'));
-	if (dns_get_record ( $dom , DNS_A )) 
-		return nsdom( ltrim(strstr($dom, '.'), '.') );
+	if (dns_get_record ( $dom , DNS_NS )) {
+			return strtolower(rtrim($dom, '.'));
+	}
+	if (dns_get_record ( $dom , DNS_A )) {
+			return nsdom( ltrim(strstr($dom, '.'), '.') );
+	}
 	return NULL;
 }
 
 function isValid($dom) {
 /* Return TRUE id domain has NS or A record */
 	if (preg_match('/^(?!:\/\/)([a-zA-Z0-9-]+\.){0,5}[a-zA-Z0-9-][a-zA-Z0-9-]+\.[a-zA-Z]{2,64}?\.{0,1}$/i',$dom) === 1) {
-		if (checkdnsrr ( $dom , 'NS' ))
-			return TRUE;
-		if (checkdnsrr ( $dom , 'A' ))
-			return TRUE;
+		if (checkdnsrr ( $dom , 'NS' )) {
+					return TRUE;
+		}
+		if (checkdnsrr ( $dom , 'A' )) {
+					return TRUE;
+		}
 	}
 	return FALSE;
 }

contrib/splunk/webhook/readPost.php

Braces +14 added lines, -11 removed lines

@@ -141,17 +141,19 @@ 
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
-	        $tolist["$thisVal"] = $data;
-        else if ($data[3]>$tolist[$thisVal][3])
-	        $tolist["$thisVal"] = $data;
-}
+        if ( !in_array($thisVal,array_keys($tolist))  ) {
+        	        $tolist["$thisVal"] = $data;
+        } else if ($data[3]>$tolist[$thisVal][3]) {
+        	        $tolist["$thisVal"] = $data;
+        }
+        }
 
 /* Make MYSQL connection */
 
 $mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user);
-if ( $mysqli === FALSE )
+if ( $mysqli === FALSE ) {
 	exit (254);
+}
 
 foreach ( array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
@@ -168,17 +170,18 @@ 
                                                 $recip = emailToNotify($domainNotify_file,$domain);
                                                 $subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
                                                                 $tables["$typedesc"]['field'], $value);
-                                                if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+                                                if (!empty($recip)) {
+                                                                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
                                                                 $subject,$value,"$quantity $unit",$reason) )
                                                                 syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+                                                }
+                                        } else {
+                                        	syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                         }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                 }
                         }
                 }
-        }
-        else {
+        } else {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
                 syslog (LOG_INFO, "$user: ".$reason);
         }

contrib/mailClassifier/function.php

Braces +106 added lines, -72 removed lines

@@ -5,18 +5,21 @@ 
 	$open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
         $m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY)
                 or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-        if ( !$m_mail ) exit(254);
+        if ( !$m_mail ) {
+        	exit(254);
+        }
 
 
         syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
         //get all folder
 	$list = imap_list($m_mail, $open, "*");
 	imap_close($m_mail);
-	if (is_array($list))
-		foreach ($list as $mbox)
+	if (is_array($list)) {
+			foreach ($list as $mbox)
 			$return[] = explode($open,$mbox,2)[1];
-	else
-		syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+	} else {
+			syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+	}
 	return $return;
 }
 
@@ -24,7 +27,9 @@ 
 	$head=array();
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$cf['authpassword'], OP_READONLY)
         	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+	if ( !$m_mail ) {
+		exit(254);
+	}
 		
 
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
@@ -36,29 +41,36 @@ 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
+	        if ( $ierr = imap_errors() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
+	        }
+	        if ( $ierr = imap_alerts() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	        }
 		imap_close( $m_mail );
 		return FALSE;
 	}
 	$nmes = count ($m_search);
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
-	if ($nmes>0) rsort($m_search);
+	if ($nmes>0) {
+		rsort($m_search);
+	}
 
         // loop for each message
-	foreach ($m_search as $onem) 
-		$head[] = imap_fetchheader($m_mail, $onem );
+	foreach ($m_search as $onem) {
+			$head[] = imap_fetchheader($m_mail, $onem );
+	}
 	imap_close($m_mail);
 	return $head;
 }
 
 function dspamLevel($prob, $conf) {
 /* Calculate DSPAM Level as the Spamassassin Plugin */
-	if (is_null($prob) or is_null($conf)) return '-';
+	if (is_null($prob) or is_null($conf)) {
+		return '-';
+	}
 	$t_prob = abs((($prob - 0.5) * 2) * 100);
 	return round(($t_prob + ($conf*100)) / 2);
 }
@@ -123,7 +135,9 @@ 
 		}
         }
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
+	if ($k>1) {
+		$result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
+	}
 
         if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.\-\+]+)/m',$header,$received) ) {
 		$k=0;
@@ -139,7 +153,9 @@ 
         	}
 	}
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
+	if ($k>1) {
+		$result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
+	}
 
 	$k=0;
         if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
@@ -155,7 +171,9 @@ 
         	}
 	}
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
+	if ($k>1) {
+		$result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
+	}
 
 	if ($dpl) { /* Use Spamassassin Plugin */
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m',$header,$received) ) {
@@ -165,57 +183,66 @@ 
 			$result['dspam']['type'] = dspamType($received['dtype'][0]);
 			$result['dspam']['level'] =$received['dlevel'][0];
         	}
-        	if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
-	}
-	else { /* Parse apart all DSPAM Header and calculate a level */
+        	if (count($received[0])>1) {
+        		$result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
+        	}
+	} else { /* Parse apart all DSPAM Header and calculate a level */
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m',$header,$received) ) {
                         $result['spam']['status']=$received['spamstatus'][0];
                         $result['spam']['score'] = $received['score'][0];
                         $result['spam']['th'] = $received['th'][0];
-			if (count($received[0])>1)
-				$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
+			if (count($received[0])>1) {
+							$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
+			}
 		}
-		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1)
-	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
-	        else
-                	$result['dspam']['type']=$received['result'];
+		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1) {
+			                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
+		} else {
+	                        	$result['dspam']['type']=$received['result'];
+	        }
 		$prob = NULL;
 		$conf = NULL;
-                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
-                        $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
-		else
-			$prob = $received['prob'];
-		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1)
-                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
-		else
-			$conf = $received['conf'];
+                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1) {
+                                        $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
+                } else {
+					$prob = $received['prob'];
+		}
+		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1) {
+		                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
+		} else {
+					$conf = $received['conf'];
+		}
 		$result['dspam']['level'] = dspamLevel($prob,$conf);
 	}
 	$received=NULL;
-	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'From header invalid or not present';
-        else
-                $result['from'] = $received['from'];
+	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1) {
+	                $result['warn'][] = 'From header invalid or not present';
+	} else {
+                        $result['from'] = $received['from'];
+        }
 
-        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'Date header invalid or not present';
-	else
-		$result['date'] = $received['date'];
+        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1) {
+                        $result['warn'][] = 'Date header invalid or not present';
+        } else {
+			$result['date'] = $received['date'];
+	}
 
 	$received=NULL;
-        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
-	else
-		$result['messageid']=$received['mid'];
+        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1) {
+                        $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
+        } else {
+			$result['messageid']=$received['mid'];
+	}
 
         $received=NULL;
 
         switch ($learn) {
 		case 'dspamc':
-        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
-				$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
-			else
-				$result['dspam']['learn']=$received['sig'];			
+        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1) {
+        						$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
+        		} else {
+							$result['dspam']['learn']=$received['sig'];
+			}
 			break;
 		case false:
 			break;
@@ -250,8 +277,9 @@ 
 	for ($i=0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
 		if (is_array($content[$key])&&($hs = array_keys($content[$key]))) {
-			foreach ($hs as $h)
-				printf('<th>%s</th>',$h);
+			foreach ($hs as $h) {
+							printf('<th>%s</th>',$h);
+			}
 		}
 	}
 		
@@ -267,15 +295,16 @@ 
 
 function formatVal($val, $learn) {
 	foreach (array_keys($val) as $key) {
-		if (is_array($val["$key"]) and ($key!='warn'))
-			$val["$key"] = formatVal($val["$key"], $learn);
-		else {
+		if (is_array($val["$key"]) and ($key!='warn')) {
+					$val["$key"] = formatVal($val["$key"], $learn);
+		} else {
 			switch ($key) {
 				case 'warn':
-					if (empty($val["$key"]))
-						$val["$key"] = '-';
-					else 
-						$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+					if (empty($val["$key"])) {
+											$val["$key"] = '-';
+					} else {
+											$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+					}
 					break;
 				case 'learn':
 					$val["$key"] = formLearn($learn, $val);
@@ -297,9 +326,10 @@ 
 				$par['class'] = $class;
 				$val["$class"] = sprintf('dspamc --user dspam --deliver=summary --class=%s --source=error --signature=%s',
 							strtolower($class), $par['learn']);
-				if (($class != $par['type'])||($par['level']<99))
-					$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
+				if (($class != $par['type'])||($par['level']<99)) {
+									$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
 						$class,$class,$val["$class"],base64_encode(json_encode($par)),$class);
+				}
 			}
 		default:
 			return $return;
@@ -308,37 +338,41 @@ 
 
 function printTableRow($row, $learn, $init=true) {
 	$color = 'inherit';
-	if ($init) 
-		$row=formatVal($row,$learn);
+	if ($init) {
+			$row=formatVal($row,$learn);
+	}
 	foreach( $row as $key => $val) {
-		if (is_array($val))
-			printTableRow($val, $learn, false);
-		else {
+		if (is_array($val)) {
+					printTableRow($val, $learn, false);
+		} else {
 			/* DSPAM format */
-			if (isset($row['type']))
-				switch($row['type']) {
+			if (isset($row['type'])) {
+							switch($row['type']) {
 					case 'Innocent':
 					case 'HAM':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'Spam':
 					case 'SPAM':
 						$color = 'rgba(255,0,0,%.1f)';
 			}
 			/* DMARC, DKIM, SPF format */
-			if (isset($row['result']))
-				switch($row['result']) {
+			if (isset($row['result'])) {
+							switch($row['result']) {
 					case 'pass':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'fail':
 						$color = 'rgba(255,0,0,%.1f)';
 				}
 			/* Spamassassin format */
-			if (isset($row['status']))
-	                        switch($row['status']) {
+			if (isset($row['status'])) {
+				                        switch($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'Yes':
 						$color = 'rgba(255,0,0,%.1f)';