falon / RBL

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) {
 	$pattern = '~[a-z]+://\S+~';
 	$ret = array();
@@ -324,6 +350,9 @@ 
 	return array();
 }
 
+/**
+ * @return string
+ */
 function humanKey($key) {
 	switch($key) {
 		case 'ip':
@@ -334,6 +363,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
+		}
 
 
 }
@@ -335,16 +335,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)) );
 }
 
@@ -354,25 +354,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);
@@ -412,16 +412,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.");
@@ -439,11 +439,11 @@ 
 		/* Extract domains url in body */
 		$domains = parseURL ($m_mail,$onem);
 
-	        /* 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
@@ -454,16 +454,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']++;
@@ -498,18 +498,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';
@@ -535,17 +535,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) ;
 	}
 	/***********************/
 
@@ -570,8 +570,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);
 }
 ?>

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 */