falon / RBL

contrib/mailClassifier/list.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 if (is_array($folders)) {
 	print '<option  value="" selected disabled>Choose a folder</option>';
 	foreach ( $folders as $folder )
-        	printf('<option  value="%s">%s</option>',
+			printf('<option  value="%s">%s</option>',
 			$folder,
 			htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP")));
 }

contrib/mailClassifier/function.php

Indentation +85 added lines, -85 removed lines

@@ -3,13 +3,13 @@ 
 function imapFolder($cf, $username) {
 	$return = array();
 	$open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
-        $m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY)
-                or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-        if ( !$m_mail ) exit(254);
+		$m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY)
+				or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
+		if ( !$m_mail ) exit(254);
 
 
-        syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
-        //get all folder
+		syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
+		//get all folder
 	$list = imap_list($m_mail, $open, "*");
 	imap_close($m_mail);
 	if (is_array($list))
@@ -23,7 +23,7 @@ 
 function imapFind ($cf, $username, $folder) {
 	$head=array();
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$cf['authpassword'], OP_READONLY)
-        	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
+			or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
 	if ( !$m_mail ) exit(254);
 		
 
@@ -36,12 +36,12 @@ 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+			if ( $ierr = imap_errors() )
+					foreach ( $ierr as $thiserr )
+							syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+			if ( $ierr = imap_alerts() )
+					foreach ( $ierr as $thiserr )
+							syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 		imap_close( $m_mail );
 		return FALSE;
 	}
@@ -49,7 +49,7 @@ 
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
 	if ($nmes>0) rsort($m_search);
 
-        // loop for each message
+		// loop for each message
 	foreach ($m_search as $onem) 
 		$head[] = imap_fetchheader($m_mail, $onem );
 	imap_close($m_mail);
@@ -80,52 +80,52 @@ 
 /* Each line must end with /r/n         */
 
 	$result = array(
-                'date' => NULL,
-                'from' => NULL,
-                'messageid' => NULL,
+				'date' => NULL,
+				'from' => NULL,
+				'messageid' => NULL,
 		'dmarc' => array(
 			'result' => NULL,
 			'dom'	=> NULL
 			),
 		'spf' => array(
-                        'result' => NULL,
-                        'dom'   => NULL
-                        ),
+						'result' => NULL,
+						'dom'   => NULL
+						),
 		'dkim' => array(
-                        'result' => NULL,
-                        'dom'   => NULL
-                        ),
-                'spam' => array(
-                        'status' => NULL,
-                        'score' => NULL,
-                        'th'    => NULL,
-                        ),
-                'dspam' => array(
-                        'type' => NULL,
-                        'level' => NULL,
+						'result' => NULL,
+						'dom'   => NULL
+						),
+				'spam' => array(
+						'status' => NULL,
+						'score' => NULL,
+						'th'    => NULL,
+						),
+				'dspam' => array(
+						'type' => NULL,
+						'level' => NULL,
 			'learn' => NULL
-                        ),
+						),
 		'warn' => NULL
-        );
+		);
 		
 
-        if ( preg_match_all ('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m',$header,$received) ) {
+		if ( preg_match_all ('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m',$header,$received) ) {
 		$k=0;
-                for ($i = count($received[0])-1;$i>=0;$i--) {
-	                foreach ($ARhosts as $mx) {
+				for ($i = count($received[0])-1;$i>=0;$i--) {
+					foreach ($ARhosts as $mx) {
 				if ($mx == $received['host'][$i]) {
 					/* This is a trusted AR result */
 					$result['dmarc']['result']=$received['dmarc'][$i];
 					$result['dmarc']['dom'] = $received['DMARCfrom'][$i];
 					$k++;
 				}
-                	}
+					}
+		}
 		}
-        }
 	$received=NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
 
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m',$header,$received) ) {
+		if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m',$header,$received) ) {
 		$k=0;
 		for ($i = count($received[0])-1;$i>=0;$i--) {
 			foreach ($ARhosts as $mx) {
@@ -134,25 +134,25 @@ 
 					$result['spf']['result']=$received['spf'][$i];
 					$result['spf']['dom'] = $received['SPFfrom'][$i];
 					$k++;
-                        	}
-                	}
-        	}
+							}
+					}
+			}
 	}
 	$received=NULL;
 	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
 
 	$k=0;
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
+		if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
 		for ($i = count($received[0])-1;$i>=0;$i--) {
-	                foreach ($ARhosts as $mx) {
-        	                if ($mx == $received['host'][$i]) {
-                	                /* This is a trusted AR result */
-                        	        $result['dkim']['result']=$received['dkim'][$i];
-                                	$result['dkim']['dom'] = $received['DKIMdom'][$i];
+					foreach ($ARhosts as $mx) {
+							if ($mx == $received['host'][$i]) {
+									/* This is a trusted AR result */
+									$result['dkim']['result']=$received['dkim'][$i];
+									$result['dkim']['dom'] = $received['DKIMdom'][$i];
 					$k++;
-                        	}
-                	}
-        	}
+							}
+					}
+			}
 	}
 	$received=NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
@@ -160,59 +160,59 @@ 
 	if ($dpl) { /* Use Spamassassin Plugin */
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m',$header,$received) ) {
 			$result['spam']['status']=$received['spamstatus'][0];
-                	$result['spam']['score'] = $received['score'][0];
+					$result['spam']['score'] = $received['score'][0];
 			$result['spam']['th'] = $received['th'][0];
 			$result['dspam']['type'] = dspamType($received['dtype'][0]);
 			$result['dspam']['level'] =$received['dlevel'][0];
-        	}
-        	if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
+			}
+			if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
 	}
 	else { /* Parse apart all DSPAM Header and calculate a level */
 		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m',$header,$received) ) {
-                        $result['spam']['status']=$received['spamstatus'][0];
-                        $result['spam']['score'] = $received['score'][0];
-                        $result['spam']['th'] = $received['th'][0];
+						$result['spam']['status']=$received['spamstatus'][0];
+						$result['spam']['score'] = $received['score'][0];
+						$result['spam']['th'] = $received['th'][0];
 			if (count($received[0])>1)
 				$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
 		}
 		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1)
-	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
-	        else
-                	$result['dspam']['type']=$received['result'];
+					$result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
+			else
+					$result['dspam']['type']=$received['result'];
 		$prob = NULL;
 		$conf = NULL;
-                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
-                        $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
+				if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
+						$result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
 		else
 			$prob = $received['prob'];
 		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1)
-                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
+						$result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
 		else
 			$conf = $received['conf'];
 		$result['dspam']['level'] = dspamLevel($prob,$conf);
 	}
 	$received=NULL;
 	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'From header invalid or not present';
-        else
-                $result['from'] = $received['from'];
+				$result['warn'][] = 'From header invalid or not present';
+		else
+				$result['from'] = $received['from'];
 
-        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'Date header invalid or not present';
+		if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
+				$result['warn'][] = 'Date header invalid or not present';
 	else
 		$result['date'] = $received['date'];
 
 	$received=NULL;
-        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
-                $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
+		if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
+				$result['warn'][] = 'Message-ID invalid, not present or present more than once.';
 	else
 		$result['messageid']=$received['mid'];
 
-        $received=NULL;
+		$received=NULL;
 
-        switch ($learn) {
+		switch ($learn) {
 		case 'dspamc':
-        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
+				if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
 				$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
 			else
 				$result['dspam']['learn']=$received['sig'];			
@@ -223,23 +223,23 @@ 
 			syslog (LOG_INFO,$user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
 	}
 	
-        return $result;
+		return $result;
 }
 
 
 
 
 function printTableHeader($title,$content,$footer=FALSE,$fcontent) {
-        print <<<END
+		print <<<END
 	<caption>$title</caption>
 	<thead>
 	<tr>
 END;
 	$kcontent = array_keys($content);
-        $cols = count($kcontent);
-        for ($i=0; $i<$cols; $i++) {
+		$cols = count($kcontent);
+		for ($i=0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-                printf ('<th colspan="%d" rowspan="%d">%s</th>',
+				printf ('<th colspan="%d" rowspan="%d">%s</th>',
 			!is_array($content[$key]) ?:
 			count(array_keys($content[$key])) ?: '1',
 			!is_array($content[$key]) ?:
@@ -255,13 +255,13 @@ 
 		}
 	}
 		
-        print '</tr></thead>';
-        if ($footer) {
-                print '<tfoot><tr>';
-                print "<th colspan=\"$cols\">".$fcontent.'</th>';
-                print '</tr></tfoot>';
-        }
-        return TRUE;
+		print '</tr></thead>';
+		if ($footer) {
+				print '<tfoot><tr>';
+				print "<th colspan=\"$cols\">".$fcontent.'</th>';
+				print '</tr></tfoot>';
+		}
+		return TRUE;
 }
 
 
@@ -336,7 +336,7 @@ 
 				}
 			/* Spamassassin format */
 			if (isset($row['status']))
-	                        switch($row['status']) {
+							switch($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;

contrib/mailClassifier/learn.php

Indentation +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
 if ( preg_match ('/^X-DSPAM-Result:\s+(?P<user>[\w\.\-\_\+\%\@]+);\s+result="(?P<result>\w+)";\s+class="(?P<class>\w+)";\s+probability=(?P<prob>[\d\.]+);\s+confidence=(?P<conf>[\d\.]+);\s+signature=(?P<sig>[\w\,]+)$/',$out[0],$received) != 1) {
 		$err = 'DSPAM Client returned an unparseable result.';
 		syslog(LOG_ERR, $username.': Learn Error: '.$err);
-                exit (sprintf('<p>%s</p>',htmlentities($err)));
+				exit (sprintf('<p>%s</p>',htmlentities($err)));
 }
 
 printf('<p>Message learned successfully with following result:</p><ul><li>Owner: <b>%s</b></li><li>Result: <b>%s</b></li><li>Class: <b>%s</b></li></ul>',
 	htmlentities($received['user']),
-        $received['result'], $received['class']);
+		$received['result'], $received['class']);
 closelog();
 ?>
 </div>

contrib/rbldns/exportdns.php

Indentation +23 added lines, -23 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 if (PHP_SAPI != "cli")
-    exit;
+	exit;
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');
@@ -20,30 +20,30 @@ 
 
 $opts = getopt('f:t:');
 if ( isset($opts['f']) ) {
-        $filetemplate = $opts['f'];
+		$filetemplate = $opts['f'];
 } else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( isset($opts['t']) ) {
-        $tablename = $opts['t'];
+		$tablename = $opts['t'];
 } else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
-        print "\nDB <$tablename> doesn't exist!\n";
-        syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
-        exit ( usage() );
+		print "\nDB <$tablename> doesn't exist!\n";
+		syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+		exit ( usage() );
 }
 $typedesc = array_keys($tables)[$typedescN];
 
 if (! file_exists($filetemplate) ) {
-        print "\nFile <$filetemplate> doesn't exists!\n";
+		print "\nFile <$filetemplate> doesn't exists!\n";
 	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if (! in_array( $typedesc, array_keys($tables) ) ) {
@@ -53,7 +53,7 @@ 
 
 if (! $tables["$typedesc"]['active'] ) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 
@@ -73,10 +73,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
@@ -87,15 +87,15 @@ 
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
 			switch ( $tables["$typedesc"]['field'] ) {
-                                  case 'ip':
-                                        $element[] = long2ip($riga['ip']);
-                                        break;
-                                  case 'network':
-                                        $element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
-                                        break;
-                                  default:
+								  case 'ip':
+										$element[] = long2ip($riga['ip']);
+										break;
+								  case 'network':
+										$element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
+										break;
+								  default:
 					$type = $tables["$typedesc"]['field'];
-                                        $element[] = $riga["$type"];
+										$element[] = $riga["$type"];
 			}
 		}
 	}

function.php

Indentation +158 added lines, -158 removed lines

@@ -4,8 +4,8 @@ 
 
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+			else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
+					else $user='unknown';
 	return $user;
 }
 
@@ -21,11 +21,11 @@ 
 }
 
 function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
-        $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
+		$db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
 	$mysqli = new mysqli($host, $user, $pass, $db, $port);
-        if ($mysqli->connect_error) {
-           	syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
-                    		. $mysqli->connect_error);
+		if ($mysqli->connect_error) {
+		   	syslog (LOG_EMERG, $loguser.': Connect Error to DB <'.$db.'> (' . $mysqli->connect_errno . ') '
+							. $mysqli->connect_error);
 		return FALSE;
 	}
 	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to ' . $mysqli->host_info) ;
@@ -66,7 +66,7 @@ 
 			}
 		}
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -79,10 +79,10 @@ 
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
                 )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
-                break;
+				break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -97,8 +97,8 @@ 
 	}
 
 	if ($myconn->query($query) === TRUE) {
-	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+		syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
+		$result=TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
@@ -116,9 +116,9 @@ 
 		$nlist = '`nlist` + 1';
 	}
 
-        switch ($type) {
+		switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,%s),
@@ -126,9 +126,9 @@ 
 			`reason` = '%s'
 			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$value);
 		break;
-          case 'network':
+		  case 'network':
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,%s),
@@ -137,7 +137,7 @@ 
                         WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$sub['net'],$sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,%s),
@@ -146,18 +146,18 @@ 
 			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$value);
 	}
 
-        if ($myconn->query($query) === TRUE) {
-            syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit from $exptime.");
+		if ($myconn->query($query) === TRUE) {
+			syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit from $exptime.");
 		$result=TRUE;
-        }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
+		}
+		else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
 function remove ($myconn,$user,$value,$type,$table) {
 
-        switch ($type) {
-          case 'ip':
+		switch ($type) {
+		  case 'ip':
 		$query = sprintf("DELETE FROM `$table` WHERE
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
@@ -173,18 +173,18 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+		if ($return=$myconn->query($query) === TRUE) 
+			syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+		else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 
-        return $return;
+		return $return;
 }
 
 
 function changestatus ($myconn,$user,$value,$status,$type,$table) {
 
 	switch ($type) {
-          case 'ip':
+		  case 'ip':
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
 		break;
 	  case 'network':
@@ -195,16 +195,16 @@ 
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
-            syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
-        }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+		if ($return=$myconn->query($query) === TRUE) {
+			syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+		}
+		else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
 
 function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
+		$return=TRUE;
 	$log=array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
@@ -214,11 +214,11 @@ 
 		/* END OF QUERY */
 		$log[0] = 'expired for';
 		$log[1] = 'disabled for';
-        	if ($myconn->multi_query($query)) {
+			if ($myconn->multi_query($query)) {
 			$j = 0;
 			do {
-		    		$numdel = $myconn->affected_rows;
-	            		syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
+					$numdel = $myconn->affected_rows;
+						syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
 				$j++;
 
 			} while ($myconn->next_result());
@@ -230,7 +230,7 @@ 
 	}
 	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
 	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
-        return $return;
+		return $return;
 }
 
 
@@ -303,7 +303,7 @@ 
 		if ( $entry->num_rows ) {
 			if ( $entry->num_rows == 1 ) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
-                        	if (isListed($riga)) {
+							if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
 					$entry->free();
 					return FALSE;
@@ -320,7 +320,7 @@ 
 function searchentry ($myconn,$value,$tablelist) {
 /* Make a MYSQL query and return result */
 
-        $type = $tablelist['field'];
+		$type = $tablelist['field'];
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
@@ -344,7 +344,7 @@ 
 				case 'ip':
 					$query = sprintf('SELECT * FROM (
 							SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)' .
-                                                		'WHERE `ip` =  INET_ATON(\'%s\')
+														'WHERE `ip` =  INET_ATON(\'%s\')
 							 ) AS val WHERE val.ip IS NOT null', $table, $table, $value);
 					break;
 				default:
@@ -355,33 +355,33 @@ 
 	}
 
 	else {
-	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
-	                switch ($type) {
-	                  case 'ip':
-	                        $query= "select * from $table where $type =  INET_ATON('$value')";
-	                        break;
-	                  case 'network':
-	                        list($sub['net'],$sub['mask'])=explode('/',$value);
-	                        $query= sprintf('select * from `%s`
+			$table = $tablelist['name'];
+			if ($value == 'ALL') $query = 'select * from '.$table;
+			else {
+					switch ($type) {
+					  case 'ip':
+							$query= "select * from $table where $type =  INET_ATON('$value')";
+							break;
+					  case 'network':
+							list($sub['net'],$sub['mask'])=explode('/',$value);
+							$query= sprintf('select * from `%s`
 						WHERE (
 							inet_aton(\'%s\') >= network AND
 							( inet_aton(\'%s\') | ( inet_aton(\'%s\') ^ (power(2,32)-1) ) )
 								<= network | ( netmask ^ (power(2,32)-1) )
 						)', $table, $sub['net'], $sub['net'], $sub['mask']);
 ;
-	                        break;
-	                  default:
-	                        $query= "select * from $table where $type = '$value'";
-	                }
-	        }
+							break;
+					  default:
+							$query= "select * from $table where $type = '$value'";
+					}
+			}
 	}
 
 	$result = $myconn->query($query);
 	if($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
-        return $result;
+		return $result;
 }
 
 function countListed ($myconn,$table) {
@@ -396,14 +396,14 @@ 
 
 
 function isFull($myconn,$typedesc,$alltables) {
-        if (isset($alltables["$typedesc"]['limit'])) {
+		if (isset($alltables["$typedesc"]['limit'])) {
 		if ( $alltables["$typedesc"]['milter'] )
 			$tab = 'net';
 		else
 			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
-        }
+				if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
+						return TRUE;
+		}
 	return FALSE;
 }
 
@@ -428,14 +428,14 @@ 
 	if ($result) {
 		printf("<pre>Your request for $type &lt;$value&gt; returned %d items.\n</pre>", $result->num_rows);
 
-        /* Check for limit in number of listed items */
+		/* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
 	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
-        		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
+				while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
 					if ($tables["$typedesc"]['bl']) $listed='Listed';
 					else $listed='WhiteListed';
@@ -461,7 +461,7 @@ 
 					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
 				$i++;
-        		}
+				}
 			print '</tbody></table>';
 		}
 		else {
@@ -481,15 +481,15 @@ 
         
 function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
+		setlocale (LC_TIME, 'it_IT');
+		$date = date("r",$now);
 	$messageID = md5(uniqid($now,1)) . '@' . gethostname();
 	$mua = 'PHP/' . phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
-    		syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
-    		exit;
+			syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
+			exit;
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
@@ -498,35 +498,35 @@ 
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
 	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
 
-        /* Parsing body */
+		/* Parsing body */
 
-        if (!file_exists($tplf['body'])) {
-                syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
-                exit;
-        }
+		if (!file_exists($tplf['body'])) {
+				syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
+				exit;
+		}
 
-        $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
-        $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
+		$body_tmpl = file_get_contents($tplf['body']);
+		$arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
+		$arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+		$body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
+		$body = preg_replace( "/\r|\n/", "\r\n", $body );
 	$body = wordwrap ( $body, 75 , "\r\n" );	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
-                $old_mailfrom = ini_get("sendmail_from");
-                ini_set("sendmail_from", $from);
-                $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
-        }
-        return $flag;
+		if ( strlen(ini_get("safe_mode"))< 1) {
+				$old_mailfrom = ini_get("sendmail_from");
+				ini_set("sendmail_from", $from);
+				$params = sprintf("-oi -f %s", '<>');
+				if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
+				else $flag=TRUE;
+				if (isset($old_mailfrom))
+						ini_set("sendmail_from", $old_mailfrom);
+		}
+		else {
+				if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
+				else $flag=TRUE;
+		}
+		return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
@@ -540,62 +540,62 @@ 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,&$reason) {
 
 /* Search and list value */
-        $type = $tables["$typedesc"]['field'];
-        $table = $tables["$typedesc"]['name'];
-        $result = searchentry ($myconn,$value,$tables["$typedesc"]);
-
-        /* Manage abnormal conditions */
-        /* Value already present in db more than once. This is absurd. Panic! */
-        if ($result->num_rows > 1) {
-                syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
-                $result->free();
-                return FALSE;
-        }
+		$type = $tables["$typedesc"]['field'];
+		$table = $tables["$typedesc"]['name'];
+		$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+
+		/* Manage abnormal conditions */
+		/* Value already present in db more than once. This is absurd. Panic! */
+		if ($result->num_rows > 1) {
+				syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
+				$result->free();
+				return FALSE;
+		}
 
-        /* Value already present in db or not present: to list anyway */
-        if ($result->num_rows >= 0) {
-                /* First, check for limit in number of listed items */
-                if (isFull($myconn,$typedesc,$tables)) {
-                        syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
-                        $result->free();
-                        return FALSE;
-                }
-                /* Second, check if the (re)list would be consistent now */
-                if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
-                        syslog(LOG_ERR, $loguser.': '.$whynot);
-                        $result->free();
-                        return FALSE;
-                }
-        }
-        /* End of abnormal conditions */
+		/* Value already present in db or not present: to list anyway */
+		if ($result->num_rows >= 0) {
+				/* First, check for limit in number of listed items */
+				if (isFull($myconn,$typedesc,$tables)) {
+						syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
+						$result->free();
+						return FALSE;
+				}
+				/* Second, check if the (re)list would be consistent now */
+				if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
+						syslog(LOG_ERR, $loguser.': '.$whynot);
+						$result->free();
+						return FALSE;
+				}
+		}
+		/* End of abnormal conditions */
 
 
-        /* Finally, here I can list the value! */
+		/* Finally, here I can list the value! */
 	$thisentry = $result->fetch_array(MYSQLI_ASSOC);
-        switch ($result->num_rows) {
-                /* Relist value if already present */
-                case 1:
-                        if ( isListed($thisentry) ) {
+		switch ($result->num_rows) {
+				/* Relist value if already present */
+				case 1:
+						if ( isListed($thisentry) ) {
 				/* Entry already listed */
 				$expdate = $thisentry['exp'];
 				$reason = sprintf('%s. Already listed. Adding 1 DAY to previous expire date.',
 					 $reason);
 				$quantity = 1;
 				$unit = 'DAY';
-                        }
+						}
 			else {
-                        	/* Entry delisted */
+							/* Entry delisted */
 				$quantity *= $thisentry['nlist'];
 				$expdate = 0; /* This forces expiration from CURRENT_TIMESTAMP */
 			}
 			$result->free();
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason, $expdate);
+						return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason, $expdate);
 
-                /* First time list value */
-                case 0:
-                        $result->free();
-                        return addtolist ($myconn,$loguser,$value,$tables["$typedesc"],$unit,$quantity,$reason,$_);
-        }
+				/* First time list value */
+				case 0:
+						$result->free();
+						return addtolist ($myconn,$loguser,$value,$tables["$typedesc"],$unit,$quantity,$reason,$_);
+		}
 }
 
 
@@ -628,7 +628,7 @@ 
 		return FALSE;
 	}
 	$result = searchentry ($myconn,'ALL',$tabletype);
-        if ($result->num_rows) {
+		if ($result->num_rows) {
 		while ($row = $result->fetch_array(MYSQLI_ASSOC)) {
 			$thisNet = long2ip($row['network']).'/'.long2ip($row['netmask']);
 			if ( isIn($thisNet, $net) ) {
@@ -648,7 +648,7 @@ 
 /* For miltermap */
 function checkMilterConf($table) {
 	if (isset($table['milter'])) {
-        	if ($table['milter'] ===  TRUE) {
+			if ($table['milter'] ===  TRUE) {
 			switch ( $table['field'] ) {
 				case 'network':
 				case 'ip':
@@ -671,15 +671,15 @@ 
 
 function milterTable($t) {
 	/* Return the milter object table for type t  or FALSE on error */
-        switch ($t) {
-                case 'network':
-                        return 'net';
-                case 'ip':
-                        return 'ips';
-                default:
+		switch ($t) {
+				case 'network':
+						return 'net';
+				case 'ip':
+						return 'ips';
+				default:
 			syslog(LOG_EMERG, "ALERT: type <$t> not allowed in configuration. ");
-                        return FALSE;
-        }
+						return FALSE;
+		}
 }
 
 
@@ -687,9 +687,9 @@ 
 	$milters=array();
 	$query = 'SELECT `name` FROM `config`';
 
-        $result = $myconn->query($query);
-        if($result === false) {
-                syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
+		$result = $myconn->query($query);
+		if($result === false) {
+				syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
 		return FALSE;
 	}
 	if ($result->num_rows) {
@@ -759,21 +759,21 @@ 
 
 function curl_get($url, array $get = NULL, array $options = array(), $loguser)
 {
-    $defaults = array(
-        CURLOPT_URL => $url. (strpos($url, '?') === FALSE ? '?' : ''). http_build_query($get),
-        CURLOPT_HEADER => 0,
-        CURLOPT_RETURNTRANSFER => TRUE,
-        CURLOPT_TIMEOUT => 4
-    );
-
-    $ch = curl_init();
-    curl_setopt_array($ch, ($options + $defaults));
-    if( ! $result = curl_exec($ch))
-    {
-        syslog(LOG_ERR, sprintf('%s: CURL Error: <%s>', $loguser, curl_error($ch)));
-    }
-    curl_close($ch);
-    return $result;
+	$defaults = array(
+		CURLOPT_URL => $url. (strpos($url, '?') === FALSE ? '?' : ''). http_build_query($get),
+		CURLOPT_HEADER => 0,
+		CURLOPT_RETURNTRANSFER => TRUE,
+		CURLOPT_TIMEOUT => 4
+	);
+
+	$ch = curl_init();
+	curl_setopt_array($ch, ($options + $defaults));
+	if( ! $result = curl_exec($ch))
+	{
+		syslog(LOG_ERR, sprintf('%s: CURL Error: <%s>', $loguser, curl_error($ch)));
+	}
+	curl_close($ch);
+	return $result;
 }
 
 

result.php

Indentation +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
 
 if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
-        if (!(isValid($_POST['Value'])))
+		if (!(isValid($_POST['Value'])))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
 
 if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
@@ -27,8 +27,8 @@ 
 }
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+		if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
+				exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
 	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
 		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
 	switch ( $_POST['Value'] ) {

contrib/ipImap/report/index.php

Indentation +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 <?php
 $reports = array();
 foreach (glob("*.{htm,html}", GLOB_BRACE) as $filename) {
-    $reports[$filename] = filemtime($filename);
+	$reports[$filename] = filemtime($filename);
 }
 arsort($reports);
 $newest = new DateTime('@'.array_shift($reports));

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

contrib/ipImap/function.php

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