falon / RBL

contrib/ipImap/getip.php

Indentation +30 added lines, -30 removed lines

@@ -5,10 +5,10 @@ 
 include_once($path.'config.php');
 require_once($path.'function.php');
 if ( !isset($version) ) {
-        openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
-        closelog();
-        exit(255);
+		openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
+		syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+		closelog();
+		exit(255);
 }
 include_once(dirname(__FILE__) . '/function.php');
 $conf = parse_ini_file($confImap_file, TRUE, INI_SCANNER_TYPED);
@@ -35,50 +35,50 @@ 
 
 	/* check you select a right list */
 	if ( !$tables[$conf['listingip']['list']['spam']]['bl'] ) {
-       		syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
-	       	exit (254);
+	   		syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
+		   	exit (254);
 	}
 	if ( !$tables[$conf['listingip']['list']['spam']]['active'] ) {
 		syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not active. Please, activate it to continue with this process.');
 		exit (254);
-        }
+		}
 }
 
 if ( !$conf['listingip']['onlyReport']['ham'] ) {
 	if ( $tables[$conf['listingip']['list']['ham']]['bl'] ) {
-        	syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
-	        exit (254);
+			syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
+			exit (254);
 	}
-        if ( !$tables[$conf['listingip']['list']['ham']]['active'] ) {
-                syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is not active. Please, activate it
+		if ( !$tables[$conf['listingip']['list']['ham']]['active'] ) {
+				syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is not active. Please, activate it
  to continue with this process.');
-                exit (254);
-        }
+				exit (254);
+		}
 }
 
 if ( !$conf['listingdom']['onlyReport']['spam'] ) {
 
-        /* check you select a right list */
-        if ( !$tables[$conf['listingdom']['list']['spam']]['bl'] ) {
-                syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spam domain? I refuse to continue.');
-                exit (254);
-        }
-        if ( !$tables[$conf['listingdom']['list']['spam']]['active'] ) {
-                syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not active. Please, activate it to continue with this process.');
-                exit (254);
-        }
+		/* check you select a right list */
+		if ( !$tables[$conf['listingdom']['list']['spam']]['bl'] ) {
+				syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spam domain? I refuse to continue.');
+				exit (254);
+		}
+		if ( !$tables[$conf['listingdom']['list']['spam']]['active'] ) {
+				syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not active. Please, activate it to continue with this process.');
+				exit (254);
+		}
 }
 
 if ( !$conf['listingdom']['onlyReport']['ham'] ) {
-        if ( $tables[$conf['listingdom']['list']['ham']]['bl'] ) {
-                syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
-                exit (254);
-        }
-        if ( !$tables[$conf['listingdom']['list']['ham']]['active'] ) {
-                syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is not active. Please, activate it
+		if ( $tables[$conf['listingdom']['list']['ham']]['bl'] ) {
+				syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
+				exit (254);
+		}
+		if ( !$tables[$conf['listingdom']['list']['ham']]['active'] ) {
+				syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is not active. Please, activate it
  to continue with this process.');
-                exit (254);
-        }
+				exit (254);
+		}
 
 }
 /* End of check list */

Spacing +23 added lines, -23 removed lines

@@ -1,16 +1,16 @@ 
 #!/usr/bin/php
 <?php
 /* Config */
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 include_once($path.'config.php');
 require_once($path.'function.php');
-if ( !isset($version) ) {
+if (!isset($version)) {
         openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+        syslog(LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
         closelog();
         exit(255);
 }
-include_once(dirname(__FILE__) . '/function.php');
+include_once(dirname(__FILE__).'/function.php');
 $conf = parse_ini_file($confImap_file, TRUE, INI_SCANNER_TYPED);
 
 
@@ -19,8 +19,8 @@ 
 openlog($tag, LOG_PID, $fac);
 
 
-if ( !$imapListActive ) {
-	syslog (LOG_INFO, $conf['syslog']['user'].': This plugin isn\'t active.');
+if (!$imapListActive) {
+	syslog(LOG_INFO, $conf['syslog']['user'].': This plugin isn\'t active.');
 	closelog();
 	exit(255);
 }
@@ -31,50 +31,50 @@ 
 $arr_tpl_data = array(date("Y-m-d", time()));
 
 /* Start of check list */
-if ( !$conf['listingip']['onlyReport']['spam'] ) {
+if (!$conf['listingip']['onlyReport']['spam']) {
 
 	/* check you select a right list */
-	if ( !$tables[$conf['listingip']['list']['spam']]['bl'] ) {
+	if (!$tables[$conf['listingip']['list']['spam']]['bl']) {
        		syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
 	       	exit (254);
 	}
-	if ( !$tables[$conf['listingip']['list']['spam']]['active'] ) {
+	if (!$tables[$conf['listingip']['list']['spam']]['active']) {
 		syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not active. Please, activate it to continue with this process.');
 		exit (254);
         }
 }
 
-if ( !$conf['listingip']['onlyReport']['ham'] ) {
-	if ( $tables[$conf['listingip']['list']['ham']]['bl'] ) {
+if (!$conf['listingip']['onlyReport']['ham']) {
+	if ($tables[$conf['listingip']['list']['ham']]['bl']) {
         	syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
 	        exit (254);
 	}
-        if ( !$tables[$conf['listingip']['list']['ham']]['active'] ) {
+        if (!$tables[$conf['listingip']['list']['ham']]['active']) {
                 syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is not active. Please, activate it
  to continue with this process.');
                 exit (254);
         }
 }
 
-if ( !$conf['listingdom']['onlyReport']['spam'] ) {
+if (!$conf['listingdom']['onlyReport']['spam']) {
 
         /* check you select a right list */
-        if ( !$tables[$conf['listingdom']['list']['spam']]['bl'] ) {
+        if (!$tables[$conf['listingdom']['list']['spam']]['bl']) {
                 syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spam domain? I refuse to continue.');
                 exit (254);
         }
-        if ( !$tables[$conf['listingdom']['list']['spam']]['active'] ) {
+        if (!$tables[$conf['listingdom']['list']['spam']]['active']) {
                 syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not active. Please, activate it to continue with this process.');
                 exit (254);
         }
 }
 
-if ( !$conf['listingdom']['onlyReport']['ham'] ) {
-        if ( $tables[$conf['listingdom']['list']['ham']]['bl'] ) {
+if (!$conf['listingdom']['onlyReport']['ham']) {
+        if ($tables[$conf['listingdom']['list']['ham']]['bl']) {
                 syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
                 exit (254);
         }
-        if ( !$tables[$conf['listingdom']['list']['ham']]['active'] ) {
+        if (!$tables[$conf['listingdom']['list']['ham']]['active']) {
                 syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is not active. Please, activate it
  to continue with this process.');
                 exit (254);
@@ -84,7 +84,7 @@ 
 /* End of check list */
 
 /* Make MYSQL connection Array */
-$mysqlconf= array(
+$mysqlconf = array(
 	'dbhost' => $dbhost,
 	'userdb' => $userdb,
 	'pwd'	 => $pwd,
@@ -101,14 +101,14 @@ 
 
 
 /* The hard work has hidden in imapReport */
-$learnfromArray = array('ham','spam');
-foreach ( $learnfromArray as $learnfrom ) {
+$learnfromArray = array('ham', 'spam');
+foreach ($learnfromArray as $learnfrom) {
 	$conf['report']['reportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['reportFile']["$learnfrom"]);
 	$conf['report']['badreportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['badreportFile']["$learnfrom"]);
 	$conf['report']['reportDomFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['reportDomFile']["$learnfrom"]);
-	imapReport ($conf,$mysqlconf,$splservice,$tables,$learnfrom);
+	imapReport($conf, $mysqlconf, $splservice, $tables, $learnfrom);
 }
 
-syslog (LOG_INFO, $conf['syslog']['user'].': End of session.');
+syslog(LOG_INFO, $conf['syslog']['user'].': End of session.');
 closelog();
 ?>

contrib/ipImap/function.php

Doc Comments +34 added lines

@@ -1,4 +1,7 @@ 
 <?php
+/**
+ * @param string $header
+ */
 function getIP($header,$mxserver,$msa) {
 /* Get submission server's IP from header's mail */
 /* Each line must end with /r/n			 */
@@ -28,11 +31,23 @@ 
 	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
 }
 
+/**
+ * @param string $hostname
+ * @param string $dateC
+ * @param string|null $msgid
+ * @param string|false $dateL
+ */
 function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
 
 	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) );
 }
 
+/**
+ * @param string $dateC
+ * @param string|null $msgid
+ * @param false|string $dateL
+ * @param string $text
+ */
 function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
 	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text );
 }
@@ -84,6 +99,10 @@ 
 }
 
 
+/**
+ * @param null|mysqli $myconn
+ * @param string $key
+ */
 function summaryReportAndList ($cf,$myconn,$tables,$category,$vet,$key) {
 	$nk = $vet['count'];
 
@@ -160,6 +179,10 @@ 
 }
 
 
+/**
+ * @param string $message_id
+ * @param string $date
+ */
 function splunksearch ($service,$message_id,$date) {
 
 	// Run a blocking search
@@ -272,6 +295,9 @@ 
 }
 /***********************************/
 
+/**
+ * @param string $text
+ */
 function getDomains ($text,$exclude) {
 	/* Pattern from https://mathiasbynens.be/demo/url-regex */
 	/* Current choice: @gruber */
@@ -330,6 +356,9 @@ 
 	return array();
 }
 
+/**
+ * @return string
+ */
 function humanKey($key) {
 	switch($key) {
 		case 'ip':
@@ -340,6 +369,11 @@ 
 	return $key;
 }
 
+/**
+ * @param resource $f
+ * @param string $key
+ * @param string $rtime
+ */
 function writeFileHeader($f,$conf,$key,$type,$rtime) {
         fwrite( $f, file_get_contents(dirname(__FILE__) . '/' . $conf['report']['reportTemplateHeader']) );
         fwrite( $f,sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>',$type, strtoupper(humanKey($key)),$rtime) );

Indentation +157 added lines, -157 removed lines

@@ -12,14 +12,14 @@ 
 #			print "Examine ".$received[0][$i]."\n";
 			if ( preg_match($msa,$received['host'][$i]) )
 				$dateR = $received['date'][$i];
-        		foreach ($mxserver as $mx) {
-        			if (!$ip)
+				foreach ($mxserver as $mx) {
+					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';
@@ -39,15 +39,15 @@ 
 
 
 function summaryBadReport ($uidvet) {
-        $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
-        $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
+		$nuid = $uidvet['count'];
+		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 */
-        $uids = array_keys($uidvet['uid']);
+		/* Remove count index */
+		$uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
+		foreach ( $uids as $uid ) {
 		$totlearn += $uidvet['uid']["$uid"]['count'];; 
 		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
 	}
@@ -60,26 +60,26 @@ 
 
 function array_msort($array, $cols)
 {
-    $colarr = array();
-    foreach ($cols as $col => $order) {
-        $colarr[$col] = array();
-        foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
-    }
-    $eval = 'array_multisort(';
-    foreach ($cols as $col => $order) {
-        $eval .= '$colarr[\''.$col.'\'],'.$order.',';
-    }
-    $eval = substr($eval,0,-1).');';
-    eval($eval);
-    $ret = array();
-    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];
-        }
-    }
-    return $ret;
+	$colarr = array();
+	foreach ($cols as $col => $order) {
+		$colarr[$col] = array();
+		foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
+	}
+	$eval = 'array_multisort(';
+	foreach ($cols as $col => $order) {
+		$eval .= '$colarr[\''.$col.'\'],'.$order.',';
+	}
+	$eval = substr($eval,0,-1).');';
+	eval($eval);
+	$ret = array();
+	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];
+		}
+	}
+	return $ret;
 
 }
 
@@ -95,8 +95,8 @@ 
 
 	foreach ( $values as $value ) {
 		if ( $value == 'count' ) continue;
-                $nlearn = $vet["$key"]["$value"]['count'];
-                unset($vet["$key"]["$value"]['count']);
+				$nlearn = $vet["$key"]["$value"]['count'];
+				unset($vet["$key"]["$value"]['count']);
 		$quantity = $cf["listing$key"]['quantity']["$category"]; /* In searchAndList this value is
 										passed by reference and modified */
 		$nuid = count($vet["$key"]["$value"]);
@@ -127,9 +127,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"]);
+				$return .= vsprintf ($rowuid,$vet["$key"]["$value"]);
 
 	}
 	$return .= sprintf ('<tr><th title="unique %s">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$key,$vet["$key"]['count'],$vet['uid']['count'],$nk);
@@ -139,20 +139,20 @@ 
 	/* Not used for listing purpose, but useful to you! */
 	$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 ) {
+		foreach ( $uids as $uid ) {
 		if ( $uid == 'count' ) continue;	
-	        $nlearn = $vet['uid']["$uid"]['count'];
-	        unset ( $vet['uid']["$uid"]['count'] );
+			$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>';
-                array_shift($vet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$vet['uid']["$uid"]);
+				$rowuid=NULL;
+				for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+				array_shift($vet['uid']["$uid"]);
+				$return .= vsprintf ($rowuid,$vet['uid']["$uid"]);
 
-        }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>',
+		}
+		$return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>',
 			$vet['uid']['count'],$key,$vet["$key"]['count'],$nk);
 
 
@@ -181,50 +181,50 @@ 
 	*/
 
 	// A one shot search
-        $searchParams = array(
-                'earliest_time' => date("c",strtotime ($date)-120),
-                'latest_time' => date("c",strtotime ($date)+60)
-        );
+		$searchParams = array(
+				'earliest_time' => date("c",strtotime ($date)-120),
+				'latest_time' => date("c",strtotime ($date)+60)
+		);
 
-        // Run a oneshot search that returns the job's results
-        $resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
-        $resultSearch = new Splunk_ResultsReader($resultsStream);
+		// Run a oneshot search that returns the job's results
+		$resultsStream = $service->oneshotSearch($searchQueryBlocking, $searchParams);
+		$resultSearch = new Splunk_ResultsReader($resultsStream);
 
 	// Use the built-in XML parser to display the job results
 	foreach ($resultSearch as $result)
 	  {
-	    if ($result instanceof Splunk_ResultsFieldOrder)
-	    {
-	      // 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)
-	    {
-	      // I don't want messages in my search
-	      return FALSE;
-	    }
-	    else if (is_array($result))
-	    {
-	      // Process a row
-	      foreach ($result as $key => $valueOrValues)
-	        {
-	         if (is_array($valueOrValues))
-	          {
-	            return FALSE;
-	          }
-	         else
-	          {
-	            return $valueOrValues;
-	            #print "  {$key} => {$value}\r\n";
-	          }
-	        }
-	    }
-	    else
-	    {
-	      #print "Unknow result type";
-	      return FALSE;
-	    }
+		if ($result instanceof Splunk_ResultsFieldOrder)
+		{
+		  // 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)
+		{
+		  // I don't want messages in my search
+		  return FALSE;
+		}
+		else if (is_array($result))
+		{
+		  // Process a row
+		  foreach ($result as $key => $valueOrValues)
+			{
+			 if (is_array($valueOrValues))
+			  {
+				return FALSE;
+			  }
+			 else
+			  {
+				return $valueOrValues;
+				#print "  {$key} => {$value}\r\n";
+			  }
+			}
+		}
+		else
+		{
+		  #print "Unknow result type";
+		  return FALSE;
+		}
 	  }
 }
 
@@ -235,38 +235,38 @@ 
 
 function flattenParts($messageParts, $flattenedParts = array(), $prefix = '', $index = 1, $fullPrefix = true) {
 
-        foreach($messageParts as $part) {
-                $flattenedParts[$prefix.$index] = $part;
-                if(isset($part->parts)) {
-                        if($part->type == 2) {
-                                $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.', 0, false);
-                        }
-                        elseif($fullPrefix) {
-                                $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.');
-                        }
-                        else {
-                                $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix);
-                        }
-                        unset($flattenedParts[$prefix.$index]->parts);
-                }
-                $index++;
-        }
-
-        return $flattenedParts;
+		foreach($messageParts as $part) {
+				$flattenedParts[$prefix.$index] = $part;
+				if(isset($part->parts)) {
+						if($part->type == 2) {
+								$flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.', 0, false);
+						}
+						elseif($fullPrefix) {
+								$flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.');
+						}
+						else {
+								$flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix);
+						}
+						unset($flattenedParts[$prefix.$index]->parts);
+				}
+				$index++;
+		}
+
+		return $flattenedParts;
 
 }
 
 function getPart($connection, $messageNumber, $partNumber, $encoding) {
 
-        $data = imap_fetchbody($connection, $messageNumber, $partNumber);
-        switch($encoding) {
-                case 0: return $data; // 7BIT
-                case 1: return $data; // 8BIT
-                case 2: return $data; // BINARY
-                case 3: return base64_decode($data); // BASE64
-                case 4: return quoted_printable_decode($data); // QUOTED_PRINTABLE
-                case 5: return $data; // OTHER
-        }
+		$data = imap_fetchbody($connection, $messageNumber, $partNumber);
+		switch($encoding) {
+				case 0: return $data; // 7BIT
+				case 1: return $data; // 8BIT
+				case 2: return $data; // BINARY
+				case 3: return base64_decode($data); // BASE64
+				case 4: return quoted_printable_decode($data); // QUOTED_PRINTABLE
+				case 5: return $data; // OTHER
+		}
 
 
 }
@@ -341,16 +341,16 @@ 
 }
 
 function writeFileHeader($f,$conf,$key,$type,$rtime) {
-        fwrite( $f, file_get_contents(dirname(__FILE__) . '/' . $conf['report']['reportTemplateHeader']) );
-        fwrite( $f,sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>',$type, strtoupper(humanKey($key)),$rtime) );
-        if ($conf["listing$key"]['onlyReport']["$type"]) {
-                fwrite( $f,sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>',
+		fwrite( $f, file_get_contents(dirname(__FILE__) . '/' . $conf['report']['reportTemplateHeader']) );
+		fwrite( $f,sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>',$type, strtoupper(humanKey($key)),$rtime) );
+		if ($conf["listing$key"]['onlyReport']["$type"]) {
+				fwrite( $f,sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>',
 		strtoupper(humanKey($key))) );
 		syslog(LOG_INFO, sprintf('%s: Report only for %s %s: no listing activated in configuration.',
 			$conf['syslog']['user'],$type,humanKey($key))
 		);
 	}
-        fwrite( $f,sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>',
+		fwrite( $f,sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>',
 	strtoupper($key),strtoupper($key),strtoupper($key)) );
 }
 
@@ -360,25 +360,25 @@ 
 	$filed = dirname(__FILE__) . '/' . $cf['report']['reportDomFile']["$type"];
 	$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());
+			or syslog (LOG_EMERG, $cf['syslog']['user'].': Error in IMAP connection to <'.$cf['imap']['mailhost'].'>: ' . imap_last_error());
 	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...');
 	//get all messages
 	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['imap']['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+		$dateN  = date ( "d-M-Y", strToTime ( "now" ) );
+		$m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
 
 	// 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 )
-	                        syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $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 )
+							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);
@@ -418,16 +418,16 @@ 
 	$uidbad['count'] = 0;
 	$uidbad['uid'] = array();
 
-        // loop for each message
+		// loop for each message
 	foreach ($m_search as $onem) {
 
-	        //get imap header info for obj thang
-	        //$headers = imap_headerinfo($m_mail, $onem);
-	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
+			//get imap header info for obj thang
+			//$headers = imap_headerinfo($m_mail, $onem);
+			//$head = imap_fetchheader($m_mail, $headers->Msgno);
 		$head = imap_fetchheader($m_mail, $onem );
-	        //$obj = imap_rfc822_parse_headers( $head);
+			//$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx_hostname']['mx'],$cf['msa']['msalearn'] );
+			list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx_hostname']['mx'],$cf['msa']['msalearn'] );
 		if (empty($mid)) {
 			$uid='NA';
 			syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving data for empty Message-ID.");
@@ -445,11 +445,11 @@ 
 		/* Extract domains url in body */
 		$domains = parseURL ($m_mail,$onem,$cf['listingdom']['exclude']);
 
-	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			/* Update count of each ip */
+			if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
 			$ipuid['count']++;					//number of right messages
 
-	                if (in_array($uid,array_keys($ipuid['uid']))) {
+					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
@@ -460,16 +460,16 @@ 
 				$ipuid['uid']['count']++;                	//number of unique uids
 			}
 
-                        if (in_array($ip,array_keys($ipuid['ip']))) {
-                                $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
+						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 {
-                                $ipuid['ip']["$ip"]['count'] = 1;
+						else {
+								$ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
-                        }
+						}
 
 			foreach ($domains as $dom) {
 				$domuid['count']++;
@@ -504,18 +504,18 @@ 
 				);
 			}
 
-	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+				/* 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
-                        else {
-                                $uidbad['uid']["$uid"]['count'] = 1;
+						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
-                        }
+								$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';
@@ -541,17 +541,17 @@ 
 	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['listingip']['threshold']["$type"].' times from at least '.$cf['listingip']['thresholduid']["$type"].' different valid uids.</h5>' );
 	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 */
+		/* Make MYSQL connection */
 	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 . ') '
-                	. $mysqli->connect_error);
-                	exit (254);
-        	}
-        	syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+			$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 . ') '
+					. $mysqli->connect_error);
+					exit (254);
+			}
+			syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
 	}
 	/***********************/
 
@@ -576,8 +576,8 @@ 
 		foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr");
 	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
-                        syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
+				foreach ( $ierr as $thiserr )
+						syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

Spacing +181 added lines, -181 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-function getIP($header,$mxserver,$msa) {
+function getIP($header, $mxserver, $msa) {
 /* Get submission server's IP from header's mail */
 /* Each line must end with /r/n			 */
 /* IP is the first one written by your mxserver	 */
@@ -7,10 +7,10 @@ 
 	$ip = FALSE;
 	$host = FALSE;
 	$dateR = FALSE;
-	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--) {
+	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]) )
+			if (preg_match($msa, $received['host'][$i]))
 				$dateR = $received['date'][$i];
         		foreach ($mxserver as $mx) {
         			if (!$ip)
@@ -21,38 +21,38 @@ 
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
+	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)
+	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']);
+	return array($ip, $host, $dateR, $dateC['date'], $mid['mid']);
 }
 
-function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
+function updateReport($ip, $uid, $ipcount, $uidcount, $hostname, $dateC, $msgid, $dateL) {
 
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) );
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n", $dateL, $dateC, $uid, $ip, $uidcount, $ipcount, $hostname, htmlentities($msgid));
 }
 
-function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text );
+function updatebadReport($uid, $dateC, $msgid, $dateL, $text) {
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n", $dateL, $dateC, $uid, htmlentities($msgid), $text);
 }
 
 
-function summaryBadReport ($uidvet) {
+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 */
         $uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
-		$totlearn += $uidvet['uid']["$uid"]['count'];; 
-		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
+        foreach ($uids as $uid) {
+		$totlearn += $uidvet['uid']["$uid"]['count']; ; 
+		$return .= sprintf('<tr><td>%s</td><td>%u</td></tr>', $uid, $uidvet['uid']["$uid"]['count']);
 	}
-	$return .= sprintf ('<tr><th>%s</th><th>%u</th></tr></table>','TOT',$totlearn);
-	$return .= sprintf ('<p>%s : %u</p>','Unique UID',$nuid);
+	$return .= sprintf('<tr><th>%s</th><th>%u</th></tr></table>', 'TOT', $totlearn);
+	$return .= sprintf('<p>%s : %u</p>', 'Unique UID', $nuid);
 
 	return $return;
 }
@@ -69,12 +69,12 @@ 
     foreach ($cols as $col => $order) {
         $eval .= '$colarr[\''.$col.'\'],'.$order.',';
     }
-    $eval = substr($eval,0,-1).');';
+    $eval = substr($eval, 0, -1).');';
     eval($eval);
     $ret = array();
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
-            $k = substr($k,1);
+            $k = substr($k, 1);
             if (!isset($ret[$k])) $ret[$k] = $array[$k];
             if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
         }
@@ -84,33 +84,33 @@ 
 }
 
 
-function summaryReportAndList ($cf,$myconn,$tables,$category,$vet,$key) {
+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);
+	$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;
+	foreach ($values as $value) {
+		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
 										passed by reference and modified */
 		$nuid = count($vet["$key"]["$value"]);
-		if ( !$cf["listing$key"]['onlyReport']["$category"] ) {
-			if ( ($nlearn >= $cf["listing$key"]['threshold']["$category"])&&($nuid >= $cf["listing$key"]['thresholduid']["$category"]) ) {
+		if (!$cf["listing$key"]['onlyReport']["$category"]) {
+			if (($nlearn>=$cf["listing$key"]['threshold']["$category"]) && ($nuid>=$cf["listing$key"]['thresholduid']["$category"])) {
 				$reason = sprintf(
 				'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);
+				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;
-		$nowlist = array( TRUE =>  array(
+		$nowlist = array(TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
 				  ),
@@ -124,46 +124,46 @@ 
 				  )
 		);
 		
-		$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>';
+		$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>';
 		array_shift($vet["$key"]["$value"]);
-                $return .= vsprintf ($rowuid,$vet["$key"]["$value"]);
+                $return .= vsprintf($rowuid, $vet["$key"]["$value"]);
 
 	}
-	$return .= sprintf ('<tr><th title="unique %s">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$key,$vet["$key"]['count'],$vet['uid']['count'],$nk);
+	$return .= sprintf('<tr><th title="unique %s">%u</th><th title="unique uids">%u</th><th>%u</th></table>', $key, $vet["$key"]['count'], $vet['uid']['count'], $nk);
 
 
 	/* Statistics by UID */
 	/* Not used for listing purpose, but useful to you! */
-	$return .= sprintf('<h3>Statistics by UID</h3><table><tr><th>UID</th><th>%s learned</th><th>Learned times</th></tr>'."\n",$key);
+	$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;	
+        foreach ($uids as $uid) {
+		if ($uid == 'count') continue;	
 	        $nlearn = $vet['uid']["$uid"]['count'];
-	        unset ( $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>';
+		$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>';
                 array_shift($vet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$vet['uid']["$uid"]);
+                $return .= vsprintf($rowuid, $vet['uid']["$uid"]);
 
         }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>',
-			$vet['uid']['count'],$key,$vet["$key"]['count'],$nk);
+        $return .= sprintf('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>',
+			$vet['uid']['count'], $key, $vet["$key"]['count'], $nk);
 
 
 	return $return;
 }
 
 
-function splunksearch ($service,$message_id,$date) {
+function splunksearch($service, $message_id, $date) {
 
 	// Run a blocking search
-	$searchQueryBlocking = 'search (message_id="'. addslashes( $message_id ) .
+	$searchQueryBlocking = 'search (message_id="'.addslashes($message_id).
 				'" OR sasl_username) | transaction message_id queue_id maxspan=3m maxpause=2m | search sasl_username message_id=* | table sasl_username';
 
 	/* Doesn't work on Splunk 6.6 for HTTP exceptions
@@ -182,8 +182,8 @@ 
 
 	// A one shot search
         $searchParams = array(
-                'earliest_time' => date("c",strtotime ($date)-120),
-                'latest_time' => date("c",strtotime ($date)+60)
+                'earliest_time' => date("c", strtotime($date)-120),
+                'latest_time' => date("c", strtotime($date)+60)
         );
 
         // Run a oneshot search that returns the job's results
@@ -197,7 +197,7 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
+	      if (count($result->getFieldNames())>1) return FALSE;
 	    }
 	    else if ($result instanceof Splunk_ResultsMessage)
 	    {
@@ -235,13 +235,13 @@ 
 
 function flattenParts($messageParts, $flattenedParts = array(), $prefix = '', $index = 1, $fullPrefix = true) {
 
-        foreach($messageParts as $part) {
+        foreach ($messageParts as $part) {
                 $flattenedParts[$prefix.$index] = $part;
-                if(isset($part->parts)) {
-                        if($part->type == 2) {
+                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 {
@@ -259,7 +259,7 @@ 
 function getPart($connection, $messageNumber, $partNumber, $encoding) {
 
         $data = imap_fetchbody($connection, $messageNumber, $partNumber);
-        switch($encoding) {
+        switch ($encoding) {
                 case 0: return $data; // 7BIT
                 case 1: return $data; // 8BIT
                 case 2: return $data; // BINARY
@@ -272,30 +272,30 @@ 
 }
 /***********************************/
 
-function getDomains ($text,$exclude) {
+function getDomains($text, $exclude) {
 	/* Pattern from https://mathiasbynens.be/demo/url-regex */
 	/* Current choice: @gruber */
 	$pattern = '#\b(([\w-]+://?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/)))#iS';
 	$ret = array();
 	$num_found = preg_match_all($pattern, $text, $out);
-	if ( ($num_found !== FALSE) && ($num_found>0) ) {
+	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) ))
+			$dom = nsdom(parse_url($url, PHP_URL_HOST));
+			if (!(empty($dom) || in_array($dom, $exclude)))
 				$ret[] = $dom;
 		}
 	}
 	return array_values(array_unique($ret));
 }
 
-function parseURL ($connection,$messageNumber, $exclusionList) {
+function parseURL($connection, $messageNumber, $exclusionList) {
 	$message = '';
 	$structure = imap_fetchstructure($connection, $messageNumber);
 	if (isset($structure->parts)) {
 		$flattenedParts = flattenParts($structure->parts);
-		foreach($flattenedParts as $partNumber => $part) {
+		foreach ($flattenedParts as $partNumber => $part) {
 
-			switch($part->type) {
+			switch ($part->type) {
 		
 				case 0:
 					// the HTML or plain text part of the email
@@ -324,13 +324,13 @@ 
 	else
 		$message = getPart($connection, $messageNumber, 1, $structure->encoding);
 
-	if ( !empty($message) )
+	if (!empty($message))
 		return getDomains($message, $exclusionList);
 	return array();
 }
 
 function humanKey($key) {
-	switch($key) {
+	switch ($key) {
 		case 'ip':
 			return 'ips';
 		case 'dom':
@@ -339,67 +339,67 @@ 
 	return $key;
 }
 
-function writeFileHeader($f,$conf,$key,$type,$rtime) {
-        fwrite( $f, file_get_contents(dirname(__FILE__) . '/' . $conf['report']['reportTemplateHeader']) );
-        fwrite( $f,sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>',$type, strtoupper(humanKey($key)),$rtime) );
+function writeFileHeader($f, $conf, $key, $type, $rtime) {
+        fwrite($f, file_get_contents(dirname(__FILE__).'/'.$conf['report']['reportTemplateHeader']));
+        fwrite($f, sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>', $type, strtoupper(humanKey($key)), $rtime));
         if ($conf["listing$key"]['onlyReport']["$type"]) {
-                fwrite( $f,sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>',
-		strtoupper(humanKey($key))) );
+                fwrite($f, sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>',
+		strtoupper(humanKey($key))));
 		syslog(LOG_INFO, sprintf('%s: Report only for %s %s: no listing activated in configuration.',
-			$conf['syslog']['user'],$type,humanKey($key))
+			$conf['syslog']['user'], $type, humanKey($key))
 		);
 	}
-        fwrite( $f,sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>',
-	strtoupper($key),strtoupper($key),strtoupper($key)) );
+        fwrite($f, sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>',
+	strtoupper($key), strtoupper($key), strtoupper($key)));
 }
 
 
-function imapReport ($cf,$myconnArray,$splunkconn,$tables,$type) {
-	$file = dirname(__FILE__) . '/' . $cf['report']['reportFile']["$type"];
-	$filed = dirname(__FILE__) . '/' . $cf['report']['reportDomFile']["$type"];
-	$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);
+function imapReport($cf, $myconnArray, $splunkconn, $tables, $type) {
+	$file = dirname(__FILE__).'/'.$cf['report']['reportFile']["$type"];
+	$filed = dirname(__FILE__).'/'.$cf['report']['reportDomFile']["$type"];
+	$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);
 		
 
-	syslog (LOG_INFO,$cf['syslog']['user'].': Successfully connected to <'.$cf['imap']['mailhost'].">; Reading $type messages of last ".$cf['imap']['oldestday'].' days...');
+	syslog(LOG_INFO, $cf['syslog']['user'].': Successfully connected to <'.$cf['imap']['mailhost'].">; Reading $type messages of last ".$cf['imap']['oldestday'].' days...');
 	//get all messages
-	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['imap']['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+	$dateTh = date("d-M-Y", strToTime('-'.$cf['imap']['oldestday'].' days'));
+        $dateN = date("d-M-Y", strToTime("now"));
+        $m_search = imap_search($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"");
 
 	// 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 )
-	                        syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $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 (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)
+	                        syslog(LOG_ERR, $cf['syslog']['user'].": IMAP Error: $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);
 		return FALSE;
 	}
-	$nmes = count ($m_search);
-	syslog (LOG_INFO,$cf['syslog']['user'].": Found $nmes mail in $type folder.");
+	$nmes = count($m_search);
+	syslog(LOG_INFO, $cf['syslog']['user'].": Found $nmes mail in $type folder.");
 	if ($nmes>0) rsort($m_search);
 
 	// Create report file
 
 	$fp = fopen($file, 'w');
-	$fpd= fopen($filed, 'w');
-	$fpb= fopen($fileb, 'w');
-	$lastup = "Last Update: " . date ("d F Y H:i", time());
-	writeFileHeader($fp,$cf,'ip',$type,$lastup);
-	writeFileHeader($fpd,$cf,'dom',$type,$lastup);
+	$fpd = fopen($filed, 'w');
+	$fpb = fopen($fileb, 'w');
+	$lastup = "Last Update: ".date("d F Y H:i", time());
+	writeFileHeader($fp, $cf, 'ip', $type, $lastup);
+	writeFileHeader($fpd, $cf, 'dom', $type, $lastup);
 
-	fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateHeader']) );
-	fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
-	fwrite( $fpb,'<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>' );
+	fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateHeader']));
+	fwrite($fpb, "<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>");
+	fwrite($fpb, '<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>');
 
 	$ipuid = array();
 	$ipuid['count'] = 0;
@@ -423,105 +423,105 @@ 
 	        //get imap header info for obj thang
 	        //$headers = imap_headerinfo($m_mail, $onem);
 	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
-		$head = imap_fetchheader($m_mail, $onem );
+		$head = imap_fetchheader($m_mail, $onem);
 	        //$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx_hostname']['mx'],$cf['msa']['msalearn'] );
+	        list ($ip, $host, $dateReceived, $dateClient, $mid) = getIP($head, $cf['mx_hostname']['mx'], $cf['msa']['msalearn']);
 		if (empty($mid)) {
-			$uid='NA';
-			syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving data for empty Message-ID.");
-		} else {
+			$uid = 'NA';
+			syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving data for empty Message-ID.");
+		}else {
 			if ($dateReceived === FALSE) {
-				$uid='unauthenticated';
-				syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
-			} else  
-				if ( !($uid = splunksearch ($splunkconn, trim($mid,'<>'), $dateReceived)) ) {
-					syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving uid from Splunk log for $mid.");
-					$uid='unknown';
+				$uid = 'unauthenticated';
+				syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
+			}else  
+				if (!($uid = splunksearch($splunkconn, trim($mid, '<>'), $dateReceived))) {
+					syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving uid from Splunk log for $mid.");
+					$uid = 'unknown';
 				}
 		}
 
 		/* Extract domains url in body */
-		$domains = parseURL ($m_mail,$onem,$cf['listingdom']['exclude']);
+		$domains = parseURL($m_mail, $onem, $cf['listingdom']['exclude']);
 
 	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
-			$ipuid['count']++;					//number of right messages
+	        if ($host and ($uid != 'NA') and ($uid != 'unauthenticated') and ($uid != 'unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			$ipuid['count']++; //number of right messages
 
-	                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
+	                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 {
 				$ipuid['uid']["$uid"]['count'] = 1;
-				$ipuid['uid']["$uid"][]=$ip;
-				$ipuid['uid']['count']++;                	//number of unique uids
+				$ipuid['uid']["$uid"][] = $ip;
+				$ipuid['uid']['count']++; //number of unique uids
 			}
 
-                        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
+                        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 {
                                 $ipuid['ip']["$ip"]['count'] = 1;
-				$ipuid['ip']["$ip"][]=$uid;
-				$ipuid['ip']['count']++;			//number of unique ips
+				$ipuid['ip']["$ip"][] = $uid;
+				$ipuid['ip']['count']++; //number of unique ips
                         }
 
 			foreach ($domains as $dom) {
 				$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
+				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 {
 					$domuid['uid']["$uid"]['count'] = 1;
-					$domuid['uid']["$uid"][]=$dom;
-					$domuid['uid']['count']++;			//number of unique uids
+					$domuid['uid']["$uid"][] = $dom;
+					$domuid['uid']['count']++; //number of unique uids
 				}
 
-				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
+				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 {
 					$domuid['dom']["$dom"]['count'] = 1;
-					$domuid['dom']["$dom"][]=$uid;
-					$domuid['dom']['count']++;		//number of unique domains
+					$domuid['dom']["$dom"][] = $uid;
+					$domuid['dom']['count']++; //number of unique domains
 				}
 
 				fwrite($fpd,
-					updateReport (
-						$dom,$uid,$domuid['dom']["$dom"]['count'],
-						$domuid['uid']["$uid"]['count'],$host,
-						$dateClient,$mid,$dateReceived
+					updateReport(
+						$dom, $uid, $domuid['dom']["$dom"]['count'],
+						$domuid['uid']["$uid"]['count'], $host,
+						$dateClient, $mid, $dateReceived
 					)
 				);
 			}
 
 	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+	        	fwrite($fp, updateReport($ip, $uid, $ipuid['ip']["$ip"]['count'], $ipuid['uid']["$uid"]['count'], $host, $dateClient, $mid, $dateReceived));
 		}
 	        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
+				$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 ($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 ) );
+			fwrite($fpb, updatebadReport($uid, $dateClient, $mid, $dateReceived, $reason));
 		}
 	}
 
@@ -529,54 +529,54 @@ 
 	//close report file and mailbox
 
 	/* Summary Report */
-	$ipuid['ip'] = array_msort( $ipuid['ip'], array('count'=>SORT_DESC) );
-	$ipuid['uid'] = array_msort( $ipuid['uid'], array('count'=>SORT_DESC) );
-	$domuid['dom'] = array_msort( $domuid['dom'], array('count'=>SORT_DESC) );
-	$domuid['uid'] = array_msort( $domuid['uid'], array('count'=>SORT_DESC) );
-	$uidbad['uid'] = array_msort( $uidbad['uid'], array('count'=>SORT_DESC) );
+	$ipuid['ip'] = array_msort($ipuid['ip'], array('count'=>SORT_DESC));
+	$ipuid['uid'] = array_msort($ipuid['uid'], array('count'=>SORT_DESC));
+	$domuid['dom'] = array_msort($domuid['dom'], array('count'=>SORT_DESC));
+	$domuid['uid'] = array_msort($domuid['uid'], array('count'=>SORT_DESC));
+	$uidbad['uid'] = array_msort($uidbad['uid'], array('count'=>SORT_DESC));
 	
 	fwrite($fp, '</table>');
 	fwrite($fpd, '</table>');
-	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['listingip']['threshold']["$type"].' times from at least '.$cf['listingip']['thresholduid']["$type"].' different valid uids.</h5>' );
-	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>' );
+	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['listingip']['threshold']["$type"].' times from at least '.$cf['listingip']['thresholduid']["$type"].' different valid uids.</h5>');
+	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"] )
+	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 . ') '
+                	syslog(LOG_EMERG, $cf['syslog']['user'].': Connect Error ('.$mysqli->connect_errno.') '
                 	. $mysqli->connect_error);
                 	exit (254);
         	}
-        	syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+        	syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to '.$mysqli->host_info);
 	}
 	/***********************/
 
-	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid, 'ip') );
-	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter']));
+	fwrite($fp, summaryReportAndList($cf, $mysqli, $tables, $type, $ipuid, 'ip'));
+	fwrite($fp, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter']));
 	fclose($fp);
 
-	fwrite($fpd, summaryReportAndList ($cf,$mysqli,$tables,$type,$domuid, 'dom') );
-	fwrite($fpd,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter']));
+	fwrite($fpd, summaryReportAndList($cf, $mysqli, $tables, $type, $domuid, 'dom'));
+	fwrite($fpd, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter']));
 	fclose($fpd);
 	
-	if ( !($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]) )
+	if (!($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]))
 		$mysqli->close();
 
 	fwrite($fpb, '</table>');
-	fwrite( $fpb,summaryBadReport( $uidbad ) );
-	fwrite($fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter']));
+	fwrite($fpb, summaryBadReport($uidbad));
+	fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter']));
 	fclose($fpb);
-	syslog (LOG_INFO,$cf['syslog']['user'].': Report files written. Listing job for '.$type.' terminated.');
-
-	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 )
-                        syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
+	syslog(LOG_INFO, $cf['syslog']['user'].': Report files written. Listing job for '.$type.' terminated.');
+
+	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)
+                        syslog(LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

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);
 }
 ?>

contrib/splunk/webhook/readPost.php

Indentation +49 added lines, -49 removed lines

@@ -26,17 +26,17 @@ 
 
  /* Conf */
 if (!isset($_GET['conf'])) {
-        syslog(LOG_ALERT,
-        sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
-                $user, $_SERVER['SCRIPT_NAME']) );
-        exit(254);
+		syslog(LOG_ALERT,
+		sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
+				$user, $_SERVER['SCRIPT_NAME']) );
+		exit(254);
 }
 $fileconf = $_GET['conf'];
 if ( !file_exists(dirname(__FILE__) . '/../' . $fileconf) ) {
-        syslog(LOG_ALERT,
-        sprintf('%s: the configuration file <%s> doesn\'t exist.',
-                $user, $fileconf ));
-        exit(254);
+		syslog(LOG_ALERT,
+		sprintf('%s: the configuration file <%s> doesn\'t exist.',
+				$user, $fileconf ));
+		exit(254);
 }
 
 closelog();
@@ -64,8 +64,8 @@ 
 
 /* check you select a blocklist */
 if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
-        exit (254);
+		syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+		exit (254);
 }
 
 
@@ -95,15 +95,15 @@ 
 if (preg_match_all('/^https?\:\/\/(?<splunkhost>[\w\.\-]+)\:8000(?:\/[\w\-\_\d]+)*\/app\/(?<splunkapp>[\w\.\-\_\d]+)\/\@go\?sid=(?<job>[\w\.\-\d]+)$/',
 	$webhook['results_link'], $out, PREG_PATTERN_ORDER) === FALSE) {
 	syslog(LOG_ALERT,
-        	sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
+			sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
 		$user, $webhook['results_link']) );
 	return 255;
 }
 
 if ( $webhook['app'] != $out['splunkapp'][0] ) {
 	syslog(LOG_ALERT,
-        	sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
-                $user, $webhook['app'], $out['splunkapp'][0] ) );
+			sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
+				$user, $webhook['app'], $out['splunkapp'][0] ) );
 	return 255;
 }
 
@@ -137,14 +137,14 @@ 
 
 $nr = count ($results);
 for ($i=1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
-        $data = str_getcsv($results[$i], ',');
-        $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;
+		$data = str_getcsv($results[$i], ',');
+		$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;
 }
 
 /* Make MYSQL connection */
@@ -154,34 +154,34 @@ 
 	exit (254);
 
 foreach ( array_keys($tolist) as $value) {
-        $quantity = $conf['quantity'];
-        $reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
-                        /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
-                                /* Sometime uid are in the form of <user>@<domain> ... */
-                                if ( strpos($value, '@') !== FALSE ) {
-                                        $domain = substr(strrchr($value, '@'), 1);
-                                        if ( strpos($domain, '@') === FALSE ) {
-                                                $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,
-                                                                $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 {
-                $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-                syslog (LOG_INFO, "$user: ".$reason);
-        }
+		$quantity = $conf['quantity'];
+		$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
+		if ( $tolist["$value"][3] >= $threshold ) {
+				if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
+						syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+						/* Send a email to domain admin if you list an email */
+						if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+								/* Sometime uid are in the form of <user>@<domain> ... */
+								if ( strpos($value, '@') !== FALSE ) {
+										$domain = substr(strrchr($value, '@'), 1);
+										if ( strpos($domain, '@') === FALSE ) {
+												$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,
+																$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 {
+				$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
+				syslog (LOG_INFO, "$user: ".$reason);
+		}
 }
 
 /* Close connection */

Spacing +33 added lines, -33 removed lines

@@ -16,11 +16,11 @@ 
 
 /************** Conf *******************/
 $base = '/var/www/html/RBL';
-require_once($base . '/config.php');
+require_once($base.'/config.php');
 
  /* Syslog basic */
-$tag            .= 'SplunkLister';
-$user		 = 'Splunk';
+$tag .= 'SplunkLister';
+$user = 'Splunk';
 
 openlog($tag, LOG_PID, $fac);
 
@@ -28,43 +28,43 @@ 
 if (!isset($_GET['conf'])) {
         syslog(LOG_ALERT,
         sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
-                $user, $_SERVER['SCRIPT_NAME']) );
+                $user, $_SERVER['SCRIPT_NAME']));
         exit(254);
 }
 $fileconf = $_GET['conf'];
-if ( !file_exists(dirname(__FILE__) . '/../' . $fileconf) ) {
+if (!file_exists(dirname(__FILE__).'/../'.$fileconf)) {
         syslog(LOG_ALERT,
         sprintf('%s: the configuration file <%s> doesn\'t exist.',
-                $user, $fileconf ));
+                $user, $fileconf));
         exit(254);
 }
 
 closelog();
-$conf = parse_ini_file( dirname(__FILE__) . '/../' . $fileconf );
+$conf = parse_ini_file(dirname(__FILE__).'/../'.$fileconf);
 
  /* Splunk inherited parameters */
-$threshold = $conf['threshold'];         /* Threshold value on trigger condition; the same which engage the alert */
+$threshold = $conf['threshold']; /* Threshold value on trigger condition; the same which engage the alert */
 
  /* Blacklist name */
 $typedesc  = $conf['typedesc'];
 
  /* How long to list's parameters */
-$unit = $conf['unit'];          /* MySQL language ;) */
+$unit = $conf['unit']; /* MySQL language ;) */
 
  /* Syslog extended info */
-$tag            .= $conf['tag'];
+$tag .= $conf['tag'];
 
  /* Splunk password of alert owner*/
 $splpwd = $conf['splunkpassword'];
 /************** End of conf *************************/
 
 openlog($tag, LOG_PID, $fac);
-require_once($base . '/function.php');
+require_once($base.'/function.php');
 
 
 /* check you select a blocklist */
-if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+if (!$tables["$typedesc"]['bl']) {
+        syslog(LOG_EMERG, "$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
         exit (254);
 }
 
@@ -96,14 +96,14 @@ 
 	$webhook['results_link'], $out, PREG_PATTERN_ORDER) === FALSE) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
-		$user, $webhook['results_link']) );
+		$user, $webhook['results_link']));
 	return 255;
 }
 
-if ( $webhook['app'] != $out['splunkapp'][0] ) {
+if ($webhook['app'] != $out['splunkapp'][0]) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
-                $user, $webhook['app'], $out['splunkapp'][0] ) );
+                $user, $webhook['app'], $out['splunkapp'][0]));
 	return 255;
 }
 
@@ -135,13 +135,13 @@ 
 
 $tolist = array();
 
-$nr = count ($results);
-for ($i=1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
+$nr = count($results);
+for ($i = 1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
         $data = str_getcsv($results[$i], ',');
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
+        if (!in_array($thisVal, array_keys($tolist)))
 	        $tolist["$thisVal"] = $data;
         else if ($data[3]>$tolist[$thisVal][3])
 	        $tolist["$thisVal"] = $data;
@@ -150,42 +150,42 @@ 
 /* 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) {
+foreach (array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
         $reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+        if ($tolist["$value"][3]>=$threshold) {
+                if (searchAndList($mysqli, $user, $tables, $typedesc, $value, $unit, $quantity, $reason)) {
+                        syslog(LOG_INFO, "$user: ".'Listing reason: '.$reason);
                         /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+                        if (($tables["$typedesc"]['field'] == 'email') OR ($tables["$typedesc"]['field'] == 'username')) {
                                 /* Sometime uid are in the form of <user>@<domain> ... */
-                                if ( strpos($value, '@') !== FALSE ) {
+                                if (strpos($value, '@') !== FALSE) {
                                         $domain = substr(strrchr($value, '@'), 1);
-                                        if ( strpos($domain, '@') === FALSE ) {
-                                                $recip = emailToNotify($domainNotify_file,$domain);
+                                        if (strpos($domain, '@') === FALSE) {
+                                                $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,
-                                                                $subject,$value,"$quantity $unit",$reason) )
+                                                        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 {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-                syslog (LOG_INFO, "$user: ".$reason);
+                syslog(LOG_INFO, "$user: ".$reason);
         }
 }
 
 /* Close connection */
-syslog (LOG_INFO, "$user: ".'Successfully end of session.');
+syslog(LOG_INFO, "$user: ".'Successfully end of session.');
 $mysqli->close();
 closelog();
 

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);
         }