falon / RBL

contrib/splunk/webhook/readPost.php

Indentation +52 added lines, -52 removed lines

@@ -25,17 +25,17 @@ 
 
  /* Conf */
 if (!isset($_GET['conf'])) {
-        syslog(LOG_ALERT,
-        sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
-                $user, $_SERVER['SCRIPT_NAME']) );
-        exit(254);
+		syslog(LOG_ALERT,
+		sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
+				$user, $_SERVER['SCRIPT_NAME']) );
+		exit(254);
 }
 $fileconf = $_GET['conf'];
 if ( !file_exists(dirname(__FILE__) . '/../' . $fileconf) ) {
-        syslog(LOG_ALERT,
-        sprintf('%s: the configuration file <%s> doesn\'t exist.',
-                $user, $fileconf ));
-        exit(254);
+		syslog(LOG_ALERT,
+		sprintf('%s: the configuration file <%s> doesn\'t exist.',
+				$user, $fileconf ));
+		exit(254);
 }
 
 closelog();
@@ -63,8 +63,8 @@ 
 
 /* check you select a blocklist */
 if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
-        exit (254);
+		syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+		exit (254);
 }
 
 
@@ -98,15 +98,15 @@ 
 if (preg_match_all('/^https?\:\/\/(?<splunkhost>[\w\.\-]+)\:8000\/app\/(?<splunkapp>[\w\.\-]+)\/\@go\?sid=(?<job>[\w\.\-\d]+)$/',
 	$webhook['results_link'], $out, PREG_PATTERN_ORDER) === FALSE) {
 	syslog(LOG_ALERT,
-        	sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
+			sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
 		$user, $webhook['results_link']) );
 	return 255;
 }
 
 if ( $webhook['app'] != $out['splunkapp'][0] ) {
 	syslog(LOG_ALERT,
-        	sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
-                $user, $webhook['app'], $out['splunkapp'][0] ) );
+			sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
+				$user, $webhook['app'], $out['splunkapp'][0] ) );
 	return 255;
 }
 
@@ -140,57 +140,57 @@ 
 
 $nr = count ($results);
 for ($i=1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
-        $data = str_getcsv($results[$i], ',');
-        $thisVal = $data[1];
-        unset($data[1]);
-        $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
-	        $tolist["$thisVal"] = $data;
-        else if ($data[3]>$tolist[$thisVal][3])
-	        $tolist["$thisVal"] = $data;
+		$data = str_getcsv($results[$i], ',');
+		$thisVal = $data[1];
+		unset($data[1]);
+		$data = array_values($data);
+		if ( !in_array($thisVal,array_keys($tolist))  )
+			$tolist["$thisVal"] = $data;
+		else if ($data[3]>$tolist[$thisVal][3])
+			$tolist["$thisVal"] = $data;
 }
 
 /* Make MYSQL connection */
 
 $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 (254);
+		syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+		. $mysqli->connect_error);
+		exit (254);
 
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
 
 foreach ( array_keys($tolist) as $value) {
-        $quantity = $conf['quantity'];
-        $reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
-                        /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
-                                /* Sometime uid are in the form of <user>@<domain> ... */
-                                if ( strpos($value, '@') !== FALSE ) {
-                                        $domain = substr(strrchr($value, '@'), 1);
-                                        if ( strpos($domain, '@') === FALSE ) {
-                                                $recip = emailToNotify($domainNotify_file,$domain);
-                                                $subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
-                                                                $tables["$typedesc"]['field'], $value);
-                                                if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
-                                                                $subject,$value,"$quantity $unit",$reason) )
-                                                                syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
-                                        }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
-                                }
-                        }
-                }
-        }
-        else {
-                $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-                syslog (LOG_INFO, "$user: ".$reason);
-        }
+		$quantity = $conf['quantity'];
+		$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
+		if ( $tolist["$value"][3] >= $threshold ) {
+				if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
+						syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+						/* Send a email to domain admin if you list an email */
+						if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+								/* Sometime uid are in the form of <user>@<domain> ... */
+								if ( strpos($value, '@') !== FALSE ) {
+										$domain = substr(strrchr($value, '@'), 1);
+										if ( strpos($domain, '@') === FALSE ) {
+												$recip = emailToNotify($domainNotify_file,$domain);
+												$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
+																$tables["$typedesc"]['field'], $value);
+												if (!empty($recip))
+														if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+																$subject,$value,"$quantity $unit",$reason) )
+																syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+										}
+										else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
+								}
+						}
+				}
+		}
+		else {
+				$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
+				syslog (LOG_INFO, "$user: ".$reason);
+		}
 }
 
 /* Close connection */

function.php

Indentation +158 added lines, -158 removed lines

@@ -4,18 +4,18 @@ 
 
 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;
 }
 
 
 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) ;
@@ -56,7 +56,7 @@ 
 			}
 		}
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -69,10 +69,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` ,
@@ -87,8 +87,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;
@@ -106,9 +106,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),
@@ -116,9 +116,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),
@@ -127,7 +127,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),
@@ -136,18 +136,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;
@@ -163,18 +163,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':
@@ -185,16 +185,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) { 
@@ -204,11 +204,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());
@@ -220,7 +220,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;
 }
 
 
@@ -293,7 +293,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;
@@ -310,7 +310,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);
@@ -334,7 +334,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:
@@ -345,33 +345,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) {
@@ -386,14 +386,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;
 }
 
@@ -413,14 +413,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';
@@ -446,7 +446,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 {
@@ -466,15 +466,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']);
@@ -483,35 +483,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) {
@@ -525,62 +525,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,$_);
+		}
 }
 
 
@@ -613,7 +613,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) ) {
@@ -633,7 +633,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':
@@ -656,15 +656,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;
+		}
 }
 
 
@@ -672,9 +672,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) {
@@ -744,21 +744,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;
 }
 
 /*