falon / RBL

contrib/splunk/webhook/readPost.php

Indentation +49 added lines, -49 removed lines

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

Spacing +33 added lines, -33 removed lines

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

Braces +14 added lines, -11 removed lines

@@ -141,17 +141,19 @@ 
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
-	        $tolist["$thisVal"] = $data;
-        else if ($data[3]>$tolist[$thisVal][3])
-	        $tolist["$thisVal"] = $data;
-}
+        if ( !in_array($thisVal,array_keys($tolist))  ) {
+        	        $tolist["$thisVal"] = $data;
+        } else if ($data[3]>$tolist[$thisVal][3]) {
+        	        $tolist["$thisVal"] = $data;
+        }
+        }
 
 /* Make MYSQL connection */
 
 $mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user);
-if ( $mysqli === FALSE )
+if ( $mysqli === FALSE ) {
 	exit (254);
+}
 
 foreach ( array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
@@ -168,17 +170,18 @@ 
                                                 $recip = emailToNotify($domainNotify_file,$domain);
                                                 $subject = sprintf('%s <%s> is now blocked because exceeds 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);
         }

function.php

Braces +152 added lines, -103 removed lines

@@ -3,22 +3,27 @@ 
 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;
 }
 
 function checkSSL() {
-	if ( empty( $_SERVER['HTTPS'] ) )
-		printf ('<div id="content">Ehi sysadmin! Your site is not secure. Please enable SSL on your server and configure a redirect, such as' .
+	if ( empty( $_SERVER['HTTPS'] ) ) {
+			printf ('<div id="content">Ehi sysadmin! Your site is not secure. Please enable SSL on your server and configure a redirect, such as' .
 			'<pre>' .
 			htmlspecialchars('<VirtualHost *:80>' . "\n" .
 			'  ServerName %s' . "\n" .
 			'  Redirect permanent / https://%s/' . "\n" .
 			'</VirtualHost>') .
 			'</pre></div>', gethostname(), gethostname());
-}
+	}
+	}
 
 function myConnect($host, $user, $pass, $db, $port, $tablelist, $typedesc, $loguser) {
         $db = ( $tablelist["$typedesc"]['milter'] ) ? $tablelist["$typedesc"]['name'] : $db;
@@ -99,8 +104,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;
 }
 
@@ -110,8 +116,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';
 	}
@@ -149,8 +154,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;
 }
 
@@ -173,9 +179,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;
 }
@@ -197,8 +205,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;	
 }
 
@@ -222,14 +231,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;
 }
 
@@ -238,8 +249,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;
+	}
 
 }
 
@@ -259,10 +273,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>';
@@ -279,9 +294,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':
@@ -293,7 +311,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!";
@@ -324,10 +344,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);
@@ -352,12 +372,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')";
@@ -379,8 +398,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;
 }
 
@@ -397,12 +417,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;
 }
@@ -415,14 +437,17 @@ 
 	$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";
 
-	if (($type == 'domain') AND ($value != 'ALL'))
-		$value = nsdom($value);
-	if (is_null($value))
-		return FALSE;
+	if (($type == 'domain') AND ($value != 'ALL')) {
+			$value = nsdom($value);
+	}
+	if (is_null($value)) {
+			return FALSE;
+	}
 
 	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
 	if ($result) {
@@ -430,18 +455,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':
@@ -454,27 +484,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>";
-}
 
 
 
@@ -517,24 +550,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) {
@@ -582,8 +623,7 @@ 
 					 $reason);
 				$quantity = 1;
 				$unit = 'DAY';
-                        }
-			else {
+                        } else {
                         	/* Entry delisted */
 				$quantity *= $thisentry['nlist'];
 				$expdate = 0; /* This forces expiration from CURRENT_TIMESTAMP */
@@ -614,9 +654,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;
 }
 
@@ -693,8 +734,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;
@@ -720,12 +762,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 */
@@ -739,19 +783,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;
 		
 }
@@ -780,20 +825,24 @@ 
 function nsdom($dom) {
 /* Return the first lowercase upper domain (or domain itself) with NS record */
 /* checkdnsrr doesn't work with alias... use dns_get_record */
-	if (dns_get_record ( $dom , DNS_NS ))
-		return strtolower(rtrim($dom, '.'));
-	if (dns_get_record ( $dom , DNS_A )) 
-		return nsdom( ltrim(strstr($dom, '.'), '.') );
+	if (dns_get_record ( $dom , DNS_NS )) {
+			return strtolower(rtrim($dom, '.'));
+	}
+	if (dns_get_record ( $dom , DNS_A )) {
+			return nsdom( ltrim(strstr($dom, '.'), '.') );
+	}
 	return NULL;
 }
 
 function isValid($dom) {
 /* Return TRUE id domain has NS or A record */
 	if (preg_match('/^(?!:\/\/)([a-zA-Z0-9-]+\.){0,5}[a-zA-Z0-9-][a-zA-Z0-9-]+\.[a-zA-Z]{2,64}?\.{0,1}$/i',$dom) === 1) {
-		if (checkdnsrr ( $dom , 'NS' ))
-			return TRUE;
-		if (checkdnsrr ( $dom , 'A' ))
-			return TRUE;
+		if (checkdnsrr ( $dom , 'NS' )) {
+					return TRUE;
+		}
+		if (checkdnsrr ( $dom , 'A' )) {
+					return TRUE;
+		}
 	}
 	return FALSE;
 }