falon / RBL

function.php

Doc Comments +14 added lines

@@ -234,6 +234,9 @@ 
 }
 
 
+/**
+ * @param integer $id
+ */
 function askMilter($myconn,$id,$obj,$typedesc,$miltId,$value,$user,$adm)  {
 	$milts = readMiltName($myconn,$user);
 	$size = count($milts);
@@ -264,6 +267,11 @@ 
 }
 
 
+/**
+ * @param integer $id
+ * @param string $what
+ * @param boolean $lock
+ */
 function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
 
 	$whynot=NULL;
@@ -522,6 +530,9 @@ 
 }
 
 
+/**
+ * @param string $reason
+ */
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,&$reason) {
 
 /* Search and list value */
@@ -591,6 +602,9 @@ 
 	return array_map('long2ip', range( ip2long($range[0]), ip2long($range[1]) ) );
 }
 
+/**
+ * @param string $netA
+ */
 function isIn($netA, $netB) {
 /* TRUE if an IP of $netA is contained in netB */
 	list($addressA,$maskA) = explode('/', $netA);

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

Spacing +154 added lines, -154 removed lines

@@ -5,36 +5,36 @@ 
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
         	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+                	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 . ') '
+           	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) ;
+	syslog(LOG_INFO, $loguser.': Successfully MySQL connected at DB <'.$db.'> to '.$mysqli->host_info);
 	return $mysqli;
 }
 
-function addtolist ($myconn,$user,$value,$tabledesc,$expUnit,$expQ,$myreason,&$err) {
+function addtolist($myconn, $user, $value, $tabledesc, $expUnit, $expQ, $myreason, &$err) {
 // See MySQL manual for $expQ and $expUnit at
 // https://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_timestampadd
 
-	$result=FALSE;
-	$sub=array();
+	$result = FALSE;
+	$sub = array();
 	$type = $tabledesc['field'];
 	$milt = $tabledesc['milter'];
 	$table = ($milt) ? milterTable($type) : $tabledesc['name'];
 
 	switch ($type) {
 	  case 'ip':
-		$query= sprintf("INSERT INTO `$table` (
+		$query = sprintf("INSERT INTO `$table` (
 			`$type` ,
 			`date` ,
 			`exp` ,
@@ -45,18 +45,18 @@ 
 		VALUES (
 			INET_ATON( '%s' ) ,
 			CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-		)" ,$value,$expUnit,$expQ,$user,$myreason);
+		)", $value, $expUnit, $expQ, $user, $myreason);
 		break;
 
 	  case 'network':
 		if (!$milt) {
-			if ( netOverlap($myconn, $tabledesc, $value, $overlappedNet, $user) ) {
+			if (netOverlap($myconn, $tabledesc, $value, $overlappedNet, $user)) {
 				$err = "<$value> overlaps the existing network <$overlappedNet>";
 				return FALSE;
 			}
 		}
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -68,11 +68,11 @@ 
                 VALUES (
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
+                )", $sub['net'], $sub['mask'], $expUnit, $expQ, $user, $myreason);
                 break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -83,23 +83,23 @@ 
                 VALUES (
                         '%s' ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$value,$expUnit,$expQ,$user,$myreason);
+                )", $value, $expUnit, $expQ, $user, $myreason);
 	}
 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+	    $result = TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function relist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason, $exptime = 0) {
+function relist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason, $exptime = 0) {
 
-	$result=FALSE;
-	if ( $exptime ) { /* Entry already listed */
+	$result = FALSE;
+	if ($exptime) { /* Entry already listed */
 		$nlist = '`nlist`';
-		$exptime = sprintf('\'%s\'', $exptime);  /* Eh MySQL... an hour lost to notice this */
+		$exptime = sprintf('\'%s\'', $exptime); /* Eh MySQL... an hour lost to notice this */
 	}
 	else {
 		$exptime = 'CURRENT_TIMESTAMP';
@@ -108,43 +108,43 @@ 
 
         switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,%s),
 			`nlist` = %s,
 			`reason` = '%s'
-			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$value);
+			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $expUnit, $expQ, $exptime, $nlist, $myreason, $value);
 		break;
           case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,%s),
                         `nlist` = %s,
                         `reason` = '%s'
-                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$sub['net'],$sub['mask']);
+                        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),
                         `nlist` = %s,
                         `reason` = '%s'
-			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$exptime,$nlist,$myreason,$value);
+			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.");
-		$result=TRUE;
+		$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) {
+function remove($myconn, $user, $value, $type, $table) {
 
         switch ($type) {
           case 'ip':
@@ -152,10 +152,10 @@ 
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
 		$query = sprintf("DELETE FROM `$table` WHERE
 			`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1",
-			$sub['net'],$sub['mask']);
+			$sub['net'], $sub['mask']);
 		break;
 	  default:
 		$query = sprintf("DELETE FROM `$table` WHERE
@@ -163,39 +163,39 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
+        if ($return = $myconn->query($query) === TRUE) 
             syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 
         return $return;
 }
 
 
-function changestatus ($myconn,$user,$value,$status,$type,$table) {
+function changestatus($myconn, $user, $value, $status, $type, $table) {
 
 	switch ($type) {
           case 'ip':
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user, $sub['net'],$sub['mask']);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $sub['net'], $sub['mask']);
 		break;
 	  default:
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
+        if ($return = $myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $return;	
 }
 
 
-function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
-	$log=array();
+function expire($myconn, $user, $tables, $expireTime) {
+        $return = TRUE;
+	$log = array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
 		/* QUERY */
@@ -214,11 +214,11 @@ 
 			} while ($myconn->next_result());
 		}
 		else {
-			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
+			syslog(LOG_ERR, "Expire job - Error: ".$myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	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;
 }
@@ -226,18 +226,18 @@ 
 
 function isListed($row) {
 
-	$exp=new DateTime($row['exp']);
-	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
+	$exp = new DateTime($row['exp']);
+	$now = new DateTime('NOW');
+	if (($exp>$now) and ($row['active'])) return true;
 	else return false;
 
 }
 
 
-function askMilter($myconn,$id,$obj,$typedesc,$miltId,$value,$user,$adm)  {
-	$milts = readMiltName($myconn,$user);
+function askMilter($myconn, $id, $obj, $typedesc, $miltId, $value, $user, $adm) {
+	$milts = readMiltName($myconn, $user);
 	$size = count($milts);
-	if (in_array($user,array_keys($adm))) {
+	if (in_array($user, array_keys($adm))) {
 		$button = <<<END
 		<form style="margin:0; display:inline;" name="Milter$id" enctype="text/plain" method="post" target="_self" action="changeMilter.php" onSubmit="xmlhttpPost('changeMilter.php', 'Milter$id', 'id$id', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 		<input name="object" type="hidden" value="$obj" /><input name="oldvalues" type="hidden" value="$value" />
@@ -247,12 +247,12 @@ 
 		<div class="noscroll">
 		<select class="input_text" name="newvalues[]" multiple size="$size">
 END;
-		$activeMilts = explode(',',$value);
-		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
+		$activeMilts = explode(',', $value);
+		foreach ($milts as $milter) {
+			if (in_array($milter, $activeMilts))
+				$selected = 'selected';
 			else
-				$selected= NULL;
+				$selected = NULL;
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -264,14 +264,14 @@ 
 }
 
 
-function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
+function ask($myconn, $id, $what, $alltables, $typedesc, $value, $lock, $user, $adm) {
 
-	$whynot=NULL;
+	$whynot = NULL;
 	switch ($what) {
 		case 'Ok':
 			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if (in_array($user, array_keys($adm)))
+				if (consistentListing($myconn, $alltables, $typedesc, $value, $whynot)) return require('relistButton.php');
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -280,18 +280,18 @@ 
 }
 
 
-function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
+function consistentListing($myconn, $alltables, $typed, $value, &$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (!isset($alltables["$typed"]['depend'])) return TRUE;
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
-		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
+		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field']) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
 			return FALSE;
 		}
-		$entry = searchentry($myconn,$value,$alltables["$listdep"]);
-		if ( $entry->num_rows ) {
-			if ( $entry->num_rows == 1 ) {
+		$entry = searchentry($myconn, $value, $alltables["$listdep"]);
+		if ($entry->num_rows) {
+			if ($entry->num_rows == 1) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
                         	if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
@@ -299,7 +299,7 @@ 
 					return FALSE;
 				}
 			}
-			if ( $entry->num_rows > 1 ) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!";}
+			if ($entry->num_rows>1) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!"; }
 		}
 		$entry->free();
 	}
@@ -307,20 +307,20 @@ 
 	return TRUE;
 }
 
-function searchentry ($myconn,$value,$tablelist) {
+function searchentry($myconn, $value, $tablelist) {
 /* Make a MYSQL query and return result */
 
         $type = $tablelist['field'];
 	
-	if ( $tablelist['milter'] ) {
+	if ($tablelist['milter']) {
 		$table = milterTable($type);
 		if ($value == 'ALL')
 			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
-				$table,$table);
+				$table, $table);
 		else {
 			switch ($type) {
 				case 'network':
-					list($sub['net'],$sub['mask'])=explode('/',$value);
+					list($sub['net'], $sub['mask']) = explode('/', $value);
 					$query = sprintf('SELECT * FROM (
 							SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id)
 				 				WHERE (
@@ -338,7 +338,7 @@ 
 							 ) AS val WHERE val.ip IS NOT null', $table, $table, $value);
 					break;
 				default:
-					syslog(LOG_EMERG, 'ALERT: The type <'.$type.'> is not allowed for milter lists.' );
+					syslog(LOG_EMERG, 'ALERT: The type <'.$type.'> is not allowed for milter lists.');
 					return FALSE;
 			}
 		}
@@ -350,11 +350,11 @@ 
 	        else {
 	                switch ($type) {
 	                  case 'ip':
-	                        $query= "select * from $table where $type =  INET_ATON('$value')";
+	                        $query = "select * from $table where $type =  INET_ATON('$value')";
 	                        break;
 	                  case 'network':
-	                        list($sub['net'],$sub['mask'])=explode('/',$value);
-	                        $query= sprintf('select * from `%s`
+	                        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) ) )
@@ -363,18 +363,18 @@ 
 ;
 	                        break;
 	                  default:
-	                        $query= "select * from $table where $type = '$value'";
+	                        $query = "select * from $table where $type = '$value'";
 	                }
 	        }
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
+	if ($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
         return $result;
 }
 
-function countListed ($myconn,$table) {
+function countListed($myconn, $table) {
 /* Return number of current listed items into a rbl table */
 	$query = "SELECT COUNT(*) as `count` FROM `$table` WHERE (`active`=1 AND TIMESTAMPDIFF(MICROSECOND,NOW(),`exp`)>0) GROUP BY `active` ORDER BY `count` DESC LIMIT 1";
 	$row = $myconn->query($query);
@@ -385,48 +385,48 @@ 
 }
 
 
-function isFull($myconn,$typedesc,$alltables) {
+function isFull($myconn, $typedesc, $alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
+		if ($alltables["$typedesc"]['milter'])
 			$tab = 'net';
 		else
 			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
+                if (countListed($myconn, $tab)>=$alltables["$typedesc"]['limit']) 
                         return TRUE;
         }
 	return FALSE;
 }
 
-function rlookup ($myconn,$user,$adm,$value,$typedesc,$tables) {
+function rlookup($myconn, $user, $adm, $value, $typedesc, $tables) {
 
 	$type = $tables["$typedesc"]['field'];
-	$whynot=NULL;
+	$whynot = NULL;
 
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
+	if ($tables["$typedesc"]['milter'])
 		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
-	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+	$result = searchentry($myconn, $value, $tables["$typedesc"]);
 	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 */
-	$full = isFull($myconn,$typedesc,$tables);
+	$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;
+			$i = 0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
+					if ($tables["$typedesc"]['bl']) $listed = 'Listed';
+					else $listed = 'WhiteListed';
 				}	
 				else
-					$listed='Ok';
+					$listed = 'Ok';
 
 				switch ($type) {
 				  case 'ip':
@@ -439,20 +439,20 @@ 
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
-					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				if ($tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]))
+					printf("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn, $i, $element, $typedesc, $riga['idmilt'], $riga['miltnames'], $user, $adm), $riga['user'], htmlspecialchars($riga['reason']), ask($myconn, $i, $listed, $tables, $typedesc, $element, $full, $user, $adm));
 				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
-					$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));
+					 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 {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			if (in_array($user, array_keys($adm)) AND ($value != 'ALL'))
+				if ((!$full) AND (consistentListing($myconn, $tables, $typedesc, $value, $whynot))) require_once('listForm.php');
 									else print '<p>'.htmlspecialchars($whynot).'</p>';
 				
 		}
@@ -464,12 +464,12 @@ 
 
 
         
-function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
+function sendEmailWarn($tplf, $from, $to, $sbj, $emailListed, $intervalToExpire, $detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
-	$messageID = md5(uniqid($now,1)) . '@' . gethostname();
-	$mua = 'PHP/' . phpversion();
+        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'])) {
@@ -478,10 +478,10 @@ 
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
-	$arr_tpl_vars = array('{from}','{to}','{date}','{messageID}','{mua}');
-	$arr_tpl_data = array($from,$to,$date,$messageID,$mua);
+	$arr_tpl_vars = array('{from}', '{to}', '{date}', '{messageID}', '{mua}');
+	$arr_tpl_data = array($from, $to, $date, $messageID, $mua);
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
-	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
+	$headers = preg_replace('/\r|\n/', "\r\n", $headers);
 
         /* Parsing body */
 
@@ -491,62 +491,62 @@ 
         }
 
         $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+        $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" );	
+        $body = preg_replace("/\r|\n/", "\r\n", $body);
+	$body = wordwrap($body, 75, "\r\n");	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
+        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 (!(mail($to, $sbj, $body, $headers, $params))) $flag = FALSE;
+                else $flag = TRUE;
                 if (isset($old_mailfrom))
                         ini_set("sendmail_from", $old_mailfrom);
         }
         else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to, $sbj, $body, $headers))) $flag = FALSE;
+                else $flag = TRUE;
         }
         return $flag;
 }
 
-function emailToNotify($notify_file,$dom) {
+function emailToNotify($notify_file, $dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
+	if (in_array($dom, array_keys($ini_array)))
 		return $ini_array["$dom"];
 	else return FALSE;
 }
 
 
-function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,&$reason) {
+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"]);
+        $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.");
+        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) {
+        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.');
+                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) ) {
+                if (!consistentListing($myconn, $tables, $typedesc, $value, $whynot)) {
                         syslog(LOG_ERR, $loguser.': '.$whynot);
                         $result->free();
                         return FALSE;
@@ -560,7 +560,7 @@ 
         switch ($result->num_rows) {
                 /* Relist value if already present */
                 case 1:
-                        if ( isListed($thisentry) ) {
+                        if (isListed($thisentry)) {
 				/* Entry already listed */
 				$expdate = $thisentry['exp'];
 				$reason = sprintf('%s. Already listed. Adding 1 DAY to previous expire date.',
@@ -574,33 +574,33 @@ 
 				$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,$_);
+                        return addtolist($myconn, $loguser, $value, $tables["$typedesc"], $unit, $quantity, $reason, $_);
         }
 }
 
 
 /*************** Functions to check if two net overlap each other ********************/
 
-function ipRange ($range) {
+function ipRange($range) {
 /* List IP in range */
-	return array_map('long2ip', range( ip2long($range[0]), ip2long($range[1]) ) );
+	return array_map('long2ip', range(ip2long($range[0]), ip2long($range[1])));
 }
 
 function isIn($netA, $netB) {
 /* TRUE if an IP of $netA is contained in netB */
-	list($addressA,$maskA) = explode('/', $netA);
-	list($addressB,$maskB) = explode('/', $netB);
+	list($addressA, $maskA) = explode('/', $netA);
+	list($addressB, $maskB) = explode('/', $netB);
 	require_once 'vendor/autoload.php';
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ($ips as $ip)
+		if ($net->address($addressB)->mask($maskB)->has($ip))
 			return TRUE;
 	return FALSE;
 }
@@ -612,11 +612,11 @@ 
 		syslog(LOG_ERR, $loguser.': '.$tabletype['name'].' is not a network list.');
 		return FALSE;
 	}
-	$result = searchentry ($myconn,'ALL',$tabletype);
+	$result = searchentry($myconn, 'ALL', $tabletype);
         if ($result->num_rows) {
 		while ($row = $result->fetch_array(MYSQLI_ASSOC)) {
 			$thisNet = long2ip($row['network']).'/'.long2ip($row['netmask']);
-			if ( isIn($thisNet, $net) ) {
+			if (isIn($thisNet, $net)) {
 				$result->free();
 				syslog(LOG_INFO, "$loguser: the net <$net> overlaps the existing network <$thisNet>.");
 				return TRUE;
@@ -633,8 +633,8 @@ 
 /* For miltermap */
 function checkMilterConf($table) {
 	if (isset($table['milter'])) {
-        	if ($table['milter'] ===  TRUE) {
-			switch ( $table['field'] ) {
+        	if ($table['milter'] === TRUE) {
+			switch ($table['field']) {
 				case 'network':
 				case 'ip':
 					return TRUE;
@@ -668,12 +668,12 @@ 
 }
 
 
-function readMiltName($myconn,$loguser) {
-	$milters=array();
+function readMiltName($myconn, $loguser) {
+	$milters = array();
 	$query = 'SELECT `name` FROM `config`';
 
         $result = $myconn->query($query);
-        if($result === false) {
+        if ($result === false) {
                 syslog(LOG_EMERG, "$loguser: ALERT: Query <$query> failed: ".$myconn->error);
 		return FALSE;
 	}
@@ -685,27 +685,27 @@ 
 	return $milters;
 }
 
-function changeMilter ($myconn,$loguser,$miltVal,$table,$miltID) {
+function changeMilter($myconn, $loguser, $miltVal, $table, $miltID) {
 	$query = array();
-	foreach ( $miltVal as $value => $action ) {
-		switch ( $action ) {
+	foreach ($miltVal as $value => $action) {
+		switch ($action) {
 			case 'keep':
 				break;
 			case 'add':
-				$query[] = sprintf( "INSERT INTO `milt` (
+				$query[] = sprintf("INSERT INTO `milt` (
                 		        	`id` ,
                         			`name` 
                 			)
                 			VALUES (
                         			%d ,
 						'%s'
-					)",$miltID,$value);
+					)",$miltID, $value);
 				break;
 			case 'del':
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if (count($query)) /* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
@@ -717,18 +717,18 @@ 
 	$myconn->autocommit(FALSE);
 	$myconn->begin_transaction(MYSQLI_TRANS_START_READ_ONLY);
 	$ok = TRUE;
-	foreach ( $query as $q ) {
+	foreach ($query as $q) {
 		if ($myconn->query($q) !== TRUE) {
 			$ok = FALSE;
 			syslog(LOG_ERR, "$loguser: Error: ".$myconn->error);
 		}
 	}
-	if ( $ok ) {
-		if ( $myconn->commit() )
+	if ($ok) {
+		if ($myconn->commit())
 			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
 		else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
+			if ($myconn->rollback())
 				syslog(LOG_INFO, "$loguser: rollback succeeded.");
 			else
 				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
@@ -745,15 +745,15 @@ 
 function curl_get($url, array $get = NULL, array $options = array(), $loguser)
 {
     $defaults = array(
-        CURLOPT_URL => $url. (strpos($url, '?') === FALSE ? '?' : ''). http_build_query($get),
+        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))
+    curl_setopt_array($ch, ($options+$defaults));
+    if (!$result = curl_exec($ch))
     {
         syslog(LOG_ERR, sprintf('%s: CURL Error: <%s>', $loguser, curl_error($ch)));
     }

Braces +130 added lines, -88 removed lines

@@ -3,9 +3,13 @@ 
 ini_set('error_log', 'syslog');
 
 function username() {
-	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+	if (isset ($_SERVER['REMOTE_USER'])) {
+		$user = $_SERVER['REMOTE_USER'];
+	} else if (isset ($_SERVER['USER'])) {
+        		$user = $_SERVER['USER'];
+        	} else {
+                		$user='unknown';
+                	}
 	return $user;
 }
 
@@ -89,8 +93,9 @@ 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
 	    $result=TRUE;
+	} else {
+		syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	}
-	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
@@ -100,8 +105,7 @@ 
 	if ( $exptime ) { /* Entry already listed */
 		$nlist = '`nlist`';
 		$exptime = sprintf('\'%s\'', $exptime);  /* Eh MySQL... an hour lost to notice this */
-	}
-	else {
+	} else {
 		$exptime = 'CURRENT_TIMESTAMP';
 		$nlist = '`nlist` + 1';
 	}
@@ -139,8 +143,9 @@ 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit from $exptime.");
 		$result=TRUE;
+        } else {
+        	syslog (LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
@@ -163,9 +168,11 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        if ($return=$myconn->query($query) === TRUE) {
+                    syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        }
 
         return $return;
 }
@@ -187,8 +194,9 @@ 
 
         if ($return=$myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
@@ -212,14 +220,16 @@ 
 				$j++;
 
 			} while ($myconn->next_result());
-		}
-		else {
+		} else {
 			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
-	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	if ( !($return) ) {
+		syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	} else {
+		syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	}
         return $return;
 }
 
@@ -228,8 +238,11 @@ 
 
 	$exp=new DateTime($row['exp']);
 	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
-	else return false;
+	if (($exp > $now) and ($row['active'])) {
+		return true;
+	} else {
+		return false;
+	}
 
 }
 
@@ -249,10 +262,11 @@ 
 END;
 		$activeMilts = explode(',',$value);
 		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
-			else
-				$selected= NULL;
+			if ( in_array($milter, $activeMilts) ) {
+							$selected= 'selected';
+			} else {
+							$selected= NULL;
+			}
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -269,9 +283,12 @@ 
 	$whynot=NULL;
 	switch ($what) {
 		case 'Ok':
-			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if ($lock) {
+				return NULL;
+			}
+			if (in_array($user,array_keys($adm))) {
+							if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			}
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -283,7 +300,9 @@ 
 function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (! isset($alltables["$typed"]['depend']) ) {
+		return TRUE;
+	}
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
 		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
@@ -314,10 +333,10 @@ 
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
-		if ($value == 'ALL')
-			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
+		if ($value == 'ALL') {
+					$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
 				$table,$table);
-		else {
+		} else {
 			switch ($type) {
 				case 'network':
 					list($sub['net'],$sub['mask'])=explode('/',$value);
@@ -342,12 +361,11 @@ 
 					return FALSE;
 			}
 		}
-	}
-
-	else {
+	} else {
 	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
+	        if ($value == 'ALL') {
+	        	$query = 'select * from '.$table;
+	        } else {
 	                switch ($type) {
 	                  case 'ip':
 	                        $query= "select * from $table where $type =  INET_ATON('$value')";
@@ -369,8 +387,9 @@ 
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
-		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	if($result === false) {
+			syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	}
         return $result;
 }
 
@@ -387,12 +406,14 @@ 
 
 function isFull($myconn,$typedesc,$alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
-			$tab = 'net';
-		else
-			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
+		if ( $alltables["$typedesc"]['milter'] ) {
+					$tab = 'net';
+		} else {
+					$tab = $alltables["$typedesc"]['name'];
+		}
+                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) {
+                                        return TRUE;
+                }
         }
 	return FALSE;
 }
@@ -405,8 +426,9 @@ 
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
-		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	if ( $tables["$typedesc"]['milter'] ) {
+			$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	}
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
 	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
@@ -415,18 +437,23 @@ 
 
         /* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
-	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	if ($full) {
+		print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	}
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
-				}	
-				else
-					$listed='Ok';
+					if ($tables["$typedesc"]['bl']) {
+						$listed='Listed';
+					} else {
+						$listed='WhiteListed';
+					}
+				} else {
+									$listed='Ok';
+				}
 
 				switch ($type) {
 				  case 'ip':
@@ -439,27 +466,30 @@ 
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) ) {
+									printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
-				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				} else {
+									 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				}
 				$i++;
         		}
 			print '</tbody></table>';
-		}
-		else {
+		} else {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
-									else print '<p>'.htmlspecialchars($whynot).'</p>';
+			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') ) {
+							if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			} else {
+										print '<p>'.htmlspecialchars($whynot).'</p>';
+									}
 				
 		}
 		$result->free();
+	} else {
+		print '<pre>Query error or something wrong in DB schema'."\n</pre>";
+	}
 	}
-	else print '<pre>Query error or something wrong in DB schema'."\n</pre>";
-}
 
 
 
@@ -502,24 +532,32 @@ 
                 $old_mailfrom = ini_get("sendmail_from");
                 ini_set("sendmail_from", $from);
                 $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to,$sbj, $body,$headers,$params))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
+                if (isset($old_mailfrom)) {
+                                        ini_set("sendmail_from", $old_mailfrom);
+                }
+        } else {
+                if (!(mail($to,$sbj, $body,$headers))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
         }
         return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
-		return $ini_array["$dom"];
-	else return FALSE;
-}
+	if (in_array($dom,array_keys($ini_array))) {
+			return $ini_array["$dom"];
+	} else {
+		return FALSE;
+	}
+	}
 
 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,&$reason) {
@@ -567,8 +605,7 @@ 
 					 $reason);
 				$quantity = 1;
 				$unit = 'DAY';
-                        }
-			else {
+                        } else {
                         	/* Entry delisted */
 				$quantity *= $thisentry['nlist'];
 				$expdate = 0; /* This forces expiration from CURRENT_TIMESTAMP */
@@ -599,9 +636,10 @@ 
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ( $ips as $ip ) {
+			if ( $net->address($addressB)->mask($maskB)->has($ip) )
 			return TRUE;
+	}
 	return FALSE;
 }
 
@@ -678,8 +716,9 @@ 
 		return FALSE;
 	}
 	if ($result->num_rows) {
-		while ($milt = $result->fetch_array(MYSQLI_ASSOC))
-			$milters[] = $milt['name'];
+		while ($milt = $result->fetch_array(MYSQLI_ASSOC)) {
+					$milters[] = $milt['name'];
+		}
 	}
 	$result->free();
 	return $milters;
@@ -705,12 +744,14 @@ 
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if ( count($query) ) {
+		/* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
 						`datemod`= CURRENT_TIMESTAMP
 					 WHERE `idmilt`=%d', $table, $loguser, $miltID);
+	}
 
 
 	/* Start a safe transaction: it commits only if all queries happen */
@@ -724,19 +765,20 @@ 
 		}
 	}
 	if ( $ok ) {
-		if ( $myconn->commit() )
-			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
-		else {
+		if ( $myconn->commit() ) {
+					syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
+		} else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
-				syslog(LOG_INFO, "$loguser: rollback succeeded.");
-			else
-				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			if ( $myconn->rollback() ) {
+							syslog(LOG_INFO, "$loguser: rollback succeeded.");
+			} else {
+							syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			}
 			$ok = FALSE;
 		}
+	} else {
+			syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	}
-	else
-		syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	return $ok;
 		
 }

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

Spacing +33 added lines, -33 removed lines

@@ -15,11 +15,11 @@ 
 
 
 /************** Conf *******************/
-require_once(dirname(__FILE__)  . '/../config.php');
+require_once(dirname(__FILE__).'/../config.php');
 
  /* Syslog basic */
-$tag            .= 'SplunkLister';
-$user		 = 'Splunk';
+$tag .= 'SplunkLister';
+$user = 'Splunk';
 
 openlog($tag, LOG_PID, $fac);
 
@@ -27,31 +27,31 @@ 
 if (!isset($_GET['conf'])) {
         syslog(LOG_ALERT,
         sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
-                $user, $_SERVER['SCRIPT_NAME']) );
+                $user, $_SERVER['SCRIPT_NAME']));
         exit(254);
 }
 $fileconf = $_GET['conf'];
-if ( !file_exists(dirname(__FILE__) . '/../' . $fileconf) ) {
+if (!file_exists(dirname(__FILE__).'/../'.$fileconf)) {
         syslog(LOG_ALERT,
         sprintf('%s: the configuration file <%s> doesn\'t exist.',
-                $user, $fileconf ));
+                $user, $fileconf));
         exit(254);
 }
 
 closelog();
-$conf = parse_ini_file( dirname(__FILE__) . '/../' . $fileconf );
+$conf = parse_ini_file(dirname(__FILE__).'/../'.$fileconf);
 
  /* Splunk inherited parameters */
-$threshold = $conf['threshold'];         /* Threshold value on trigger condition; the same which engage the alert */
+$threshold = $conf['threshold']; /* Threshold value on trigger condition; the same which engage the alert */
 
  /* Blacklist name */
 $typedesc  = $conf['typedesc'];
 
  /* How long to list's parameters */
-$unit = $conf['unit'];          /* MySQL language ;) */
+$unit = $conf['unit']; /* MySQL language ;) */
 
  /* Syslog extended info */
-$tag            .= $conf['tag'];
+$tag .= $conf['tag'];
 
  /* Splunk password of alert owner*/
 $splpwd = $conf['splunkpassword'];
@@ -62,8 +62,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.");
+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);
 }
 
@@ -99,14 +99,14 @@ 
 	$webhook['results_link'], $out, PREG_PATTERN_ORDER) === FALSE) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
-		$user, $webhook['results_link']) );
+		$user, $webhook['results_link']));
 	return 255;
 }
 
-if ( $webhook['app'] != $out['splunkapp'][0] ) {
+if ($webhook['app'] != $out['splunkapp'][0]) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
-                $user, $webhook['app'], $out['splunkapp'][0] ) );
+                $user, $webhook['app'], $out['splunkapp'][0]));
 	return 255;
 }
 
@@ -138,13 +138,13 @@ 
 
 $tolist = array();
 
-$nr = count ($results);
-for ($i=1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
+$nr = count($results);
+for ($i = 1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
         $data = str_getcsv($results[$i], ',');
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
+        if (!in_array($thisVal, array_keys($tolist)))
 	        $tolist["$thisVal"] = $data;
         else if ($data[3]>$tolist[$thisVal][3])
 	        $tolist["$thisVal"] = $data;
@@ -154,47 +154,47 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-        syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+        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) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-foreach ( array_keys($tolist) as $value) {
+foreach (array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
         $reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+        if ($tolist["$value"][3]>=$threshold) {
+                if (searchAndList($mysqli, $user, $tables, $typedesc, $value, $unit, $quantity, $reason)) {
+                        syslog(LOG_INFO, "$user: ".'Listing reason: '.$reason);
                         /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+                        if (($tables["$typedesc"]['field'] == 'email') OR ($tables["$typedesc"]['field'] == 'username')) {
                                 /* Sometime uid are in the form of <user>@<domain> ... */
-                                if ( strpos($value, '@') !== FALSE ) {
+                                if (strpos($value, '@') !== FALSE) {
                                         $domain = substr(strrchr($value, '@'), 1);
-                                        if ( strpos($domain, '@') === FALSE ) {
-                                                $recip = emailToNotify($domainNotify_file,$domain);
+                                        if (strpos($domain, '@') === FALSE) {
+                                                $recip = emailToNotify($domainNotify_file, $domain);
                                                 $subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
                                                                 $tables["$typedesc"]['field'], $value);
                                                 if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
-                                                                $subject,$value,"$quantity $unit",$reason) )
+                                                        if (sendEmailWarn($tplfile, 'postmaster@csi.it', $recip,
+                                                                $subject, $value, "$quantity $unit", $reason))
                                                                 syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
                                         }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
+                                        else syslog(LOG_ERR, "$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                 }
                         }
                 }
         }
         else {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-                syslog (LOG_INFO, "$user: ".$reason);
+                syslog(LOG_INFO, "$user: ".$reason);
         }
 }
 
 /* Close connection */
-syslog (LOG_INFO, "$user: ".'Successfully end of session.');
+syslog(LOG_INFO, "$user: ".'Successfully end of session.');
 $mysqli->close();
 closelog();
 

Braces +12 added lines, -10 removed lines

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