falon / RBL

contrib/splunk/webhook/readPost.php

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($host, $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 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();
 

index.php

Spacing +5 added lines, -5 removed lines

@@ -14,11 +14,11 @@ 
 require_once('function.php');
 
 checkSSL();
-if ( $require_auth )
-	if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+if ($require_auth)
+	if (username() == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>");
 
 
-if ( $imapListActive )
+if ($imapListActive)
 	print ' <p style="text-align: right"><a href="/spamreport" target="_new">SPAM Learn Observer</a></p>';
 
 print <<<END
@@ -27,10 +27,10 @@ 
 END;
 
 
-$option=NULL;
+$option = NULL;
 $desc = array_keys($tables);
 foreach ($desc as $description) { 
-	$disabled = $tables["$description"]['active']==TRUE ? '' : ' disabled';  
+	$disabled = $tables["$description"]['active'] == TRUE ? '' : ' disabled';  
 	$option .= '<option value="'.$description."\"$disabled>$description</option>";
 	}
 

function.php

Spacing +161 added lines, -161 removed lines

@@ -5,46 +5,46 @@ 
 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 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' .
-			'<pre>' .
-			htmlspecialchars('<VirtualHost *:80>' . "\n" .
-			'  ServerName %s' . "\n" .
-			'  Redirect permanent / https://%s/' . "\n" .
-			'</VirtualHost>') .
+	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;
+        $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` ,
@@ -55,18 +55,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` ,
@@ -78,11 +78,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` ,
@@ -93,23 +93,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';
@@ -118,43 +118,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':
@@ -162,10 +162,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
@@ -173,39 +173,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 */
@@ -224,11 +224,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;
 }
@@ -236,18 +236,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" />
@@ -257,12 +257,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>';
@@ -274,14 +274,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':
@@ -290,18 +290,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!";
@@ -309,7 +309,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();
 	}
@@ -317,20 +317,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 (
@@ -348,7 +348,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;
 			}
 		}
@@ -360,11 +360,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) ) )
@@ -373,18 +373,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);
@@ -395,48 +395,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':
@@ -449,20 +449,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>';
 				
 		}
@@ -474,12 +474,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'])) {
@@ -488,10 +488,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 */
 
@@ -501,62 +501,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;
@@ -570,7 +570,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.',
@@ -584,33 +584,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;
 }
@@ -622,11 +622,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;
@@ -643,8 +643,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;
@@ -678,12 +678,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;
 	}
@@ -695,27 +695,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\',
@@ -727,18 +727,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!");
@@ -755,15 +755,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)));
     }

contrib/ipImap/getip.php

Spacing +16 added lines, -16 removed lines

@@ -1,16 +1,16 @@ 
 #!/usr/bin/php
 <?php
 /* Config */
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 include_once($path.'config.php');
 require_once($path.'function.php');
-if ( !isset($version) ) {
+if (!isset($version)) {
         openlog('myRBLemergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
+        syslog(LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?');
         closelog();
         exit(255);
 }
-include_once(dirname(__FILE__) . '/function.php');
+include_once(dirname(__FILE__).'/function.php');
 $conf = parse_ini_file($confImap_file);
 
 
@@ -19,8 +19,8 @@ 
 openlog($tag, LOG_PID, $fac);
 
 
-if ( !$imapListActive ) {
-	syslog (LOG_INFO, $conf['user'].': This plugin isn\'t active.');
+if (!$imapListActive) {
+	syslog(LOG_INFO, $conf['user'].': This plugin isn\'t active.');
 	closelog();
 	exit(255);
 }
@@ -31,20 +31,20 @@ 
 $arr_tpl_data = array(date("Y-m-d", time()));
 
 
-if ( !$conf['onlyReport'] ) {
+if (!$conf['onlyReport']) {
 
 	/* check you select a right list */
-	if ( !$tables[$conf['list']['spam']]['bl'] ) {
+	if (!$tables[$conf['list']['spam']]['bl']) {
        		syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.');
 	       	exit (254);
 	}
-	if ( $tables[$conf['list']['ham']]['bl'] ) {
+	if ($tables[$conf['list']['ham']]['bl']) {
         	syslog(LOG_EMERG, $conf['user'].': <'.$conf['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.');
 	        exit (254);
 	}
 
 	/* Make MYSQL connection Array */
-	$mysqlconf= array(
+	$mysqlconf = array(
 		'dbhost' => $dbhost,
 		'userdb' => $userdb,
 		'pwd'	 => $pwd,
@@ -55,7 +55,7 @@ 
 
 else {
 	$mysqlconf = NULL;
-	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.') ;
+	syslog(LOG_INFO, $conf['user'].': Report only, no listing activated in configuration.');
 }
 
 
@@ -67,16 +67,16 @@ 
 
 
 /* The hard work has hidden in imapReport */
-$learnfromArray = array('ham','spam');
-foreach ( $learnfromArray as $learnfrom ) {
+$learnfromArray = array('ham', 'spam');
+foreach ($learnfromArray as $learnfrom) {
 	$conf['reportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['reportFile']["$learnfrom"]);
 	$conf['badreportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['badreportFile']["$learnfrom"]);
-	imapReport ($conf,$mysqlconf,$splservice,$tables,$learnfrom);
+	imapReport($conf, $mysqlconf, $splservice, $tables, $learnfrom);
 }
 
-if ( !$conf['onlyReport'] ) {
+if (!$conf['onlyReport']) {
 	/* Close connection */
-	syslog (LOG_INFO, $conf['user'].': Successfully end of session.');
+	syslog(LOG_INFO, $conf['user'].': Successfully end of session.');
 }
 closelog();
 ?>

contrib/mailClassifier/list.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <select name="folder" style="width:215px" onChange="xmlhttpPost('result.php', 'Classify', 'Result', '<img src=\'/include/pleasewait.gif\'>', true); return false;">
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'function.php');
 require_once($path.'config.php');
 require_once('function.php');
@@ -11,9 +11,9 @@ 
 openlog($tag, LOG_PID, $fac);
 
 $conf['imap']['user'] = username();
-$folders=imapFolder($conf['imap'], $_POST['username']);
+$folders = imapFolder($conf['imap'], $_POST['username']);
 print '<option  value="" selected disabled>Choose a folder</option>';
-foreach ( $folders as $folder )
+foreach ($folders as $folder)
         printf('<option  value="%s">%s</option>',
 		$folder,
 		htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP")));

contrib/mailClassifier/index.php

Spacing +6 added lines, -6 removed lines

@@ -10,24 +10,24 @@
 <body>
 <h1> Mail Classifier</h1> 
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'config.php');
 require_once($path.'function.php');
 require_once('function.php');
 
-if ( !isset($version) ) {
+if (!isset($version)) {
         openlog('mailClassifierEmergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__));
+        syslog(LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__));
         closelog();
         exit(255);
 }
 
 checkSSL();
 $user = username();
-$isAdmin = in_array($user,array_keys($admins));
+$isAdmin = in_array($user, array_keys($admins));
 $canChange = ($isAdmin) ? '' : 'readonly';
-if ( $require_auth )
-	if ( $user == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+if ($require_auth)
+	if ($user == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>");
 
 
 print <<<END

contrib/mailClassifier/learn.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <div id="content">
 <h3>Log</h3>
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'function.php');
 require_once($path.'config.php');
 $conf = parse_ini_file('imap.conf', TRUE);
@@ -16,17 +16,17 @@ 
 
 syslog(LOG_INFO, sprintf('%s: Learn as <%s> on signature: <%s>', $username, $par->class, $par->learn));
 $cmd = escapeshellcmd($_POST['cmd']);
-exec ( $cmd, $out, $ret );
+exec($cmd, $out, $ret);
 if ($ret != 0) {
 	$err = 'DSPAM Client returns a bad exit state. Sorry, probably the learn was successful, but I don\'t know...';
 	syslog(LOG_ERR, $username.': Learn Error: '.$err);	
-	exit (sprintf('<p>%s</p>',htmlentities($err)));
+	exit (sprintf('<p>%s</p>', htmlentities($err)));
 }
-syslog(LOG_INFO,'%s: Learn result: "%s"',$username, $out[0]);  
-if ( preg_match ('/^X-DSPAM-Result:\s+(?P<user>[\w\.\@]+);\s+result="(?P<result>\w+)";\s+class="(?P<class>\w+)";\s+probability=(?P<prob>[\d\.]+);\s+confidence=(?P<conf>[\d\.]+);\s+signature=(?P<sig>[\w\,]+)$/',$out[0],$received) != 1) {
+syslog(LOG_INFO, '%s: Learn result: "%s"', $username, $out[0]);  
+if (preg_match('/^X-DSPAM-Result:\s+(?P<user>[\w\.\@]+);\s+result="(?P<result>\w+)";\s+class="(?P<class>\w+)";\s+probability=(?P<prob>[\d\.]+);\s+confidence=(?P<conf>[\d\.]+);\s+signature=(?P<sig>[\w\,]+)$/', $out[0], $received) != 1) {
 		$err = 'DSPAM Client returned an unparseable result.';
 		syslog(LOG_ERR, $username.': Learn Error: '.$err);
-                exit (sprintf('<p>%s</p>',htmlentities($err)));
+                exit (sprintf('<p>%s</p>', htmlentities($err)));
 }
 
 printf('<p>Message learned successfully with following result:</p><ul><li>Owner: <b>%s</b></li><li>Result: <b>%s</b></li><li>Class: <b>%s</b></li></ul>',

contrib/mailClassifier/function.php

Spacing +85 added lines, -87 removed lines

@@ -2,56 +2,56 @@ 
 
 function imapFolder($cf, $username) {
 	$return = array();
-	$open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
+	$open = '{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
         $m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY)
-                or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-        if ( !$m_mail ) exit(254);
+                or syslog(LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: '.imap_last_error());
+        if (!$m_mail) exit(254);
 
 
-        syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
+        syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
         //get all folder
 	$list = imap_list($m_mail, $open, "*");
 	imap_close($m_mail);
 	if (is_array($list))
 		foreach ($list as $mbox)
-			$return[] = explode($open,$mbox,2)[1];
+			$return[] = explode($open, $mbox, 2)[1];
 	else
-		syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+		syslog(LOG_INFO, $cf['user'].': imap_list failed: '.imap_last_error());
 	return $return;
 }
 
-function imapFind ($cf, $username, $folder) {
-	$head=array();
-	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$cf['authpassword'], OP_READONLY)
-        	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+function imapFind($cf, $username, $folder) {
+	$head = array();
+	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username, $cf['authpassword'], OP_READONLY)
+        	or syslog(LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: '.imap_last_error());
+	if (!$m_mail) exit(254);
 		
 
-	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
+	syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
 	//get all messages
-	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-	$m_search=imap_search ($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \"" );
+	$dateTh = date("d-M-Y", strToTime('-'.$cf['oldestday'].' days'));
+	$m_search = imap_search($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \"");
 
 
 	// Order results starting from newest message
-	if ( empty($m_search) ) {
-		syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
-		imap_close( $m_mail );
+	if (empty($m_search)) {
+		syslog(LOG_INFO, $cf['user'].": No suitable mail found in <$folder> folder.");
+	        if ($ierr = imap_errors())
+	                foreach ($ierr as $thiserr)
+	                        syslog(LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+	        if ($ierr = imap_alerts())
+	                foreach ($ierr as $thiserr)
+	                        syslog(LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+		imap_close($m_mail);
 		return FALSE;
 	}
-	$nmes = count ($m_search);
-	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
+	$nmes = count($m_search);
+	syslog(LOG_INFO, $cf['user'].": Found $nmes mail in <$folder> folder.");
 	if ($nmes>0) rsort($m_search);
 
         // loop for each message
 	foreach ($m_search as $onem) 
-		$head[] = imap_fetchheader($m_mail, $onem );
+		$head[] = imap_fetchheader($m_mail, $onem);
 	imap_close($m_mail);
 	return $head;
 }
@@ -59,11 +59,11 @@ 
 function dspamLevel($prob, $conf) {
 /* Calculate DSPAM Level as the Spamassassin Plugin */
 	if (is_null($prob) or is_null($conf)) return '-';
-	$t_prob = abs((($prob - 0.5) * 2) * 100);
-	return round(($t_prob + ($conf*100)) / 2);
+	$t_prob = abs((($prob-0.5) * 2) * 100);
+	return round(($t_prob+($conf * 100)) / 2);
 }
 
-function imapInfo($user,$header,$ARhosts,$dpl=false, $learn=false) {
+function imapInfo($user, $header, $ARhosts, $dpl = false, $learn = false) {
 /* Get relevant Info from header's mail */
 /* Each line must end with /r/n         */
 
@@ -97,118 +97,118 @@ 
         );
 		
 
-        if ( preg_match_all ('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m',$header,$received) ) {
-		$k=0;
-                for ($i = count($received[0])-1;$i>=0;$i--) {
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m', $header, $received)) {
+		$k = 0;
+                for ($i = count($received[0])-1; $i>=0; $i--) {
 	                foreach ($ARhosts as $mx) {
 				if ($mx == $received['host'][$i]) {
 					/* This is a trusted AR result */
-					$result['dmarc']['result']=$received['dmarc'][$i];
+					$result['dmarc']['result'] = $received['dmarc'][$i];
 					$result['dmarc']['dom'] = $received['DMARCfrom'][$i];
 					$k++;
 				}
                 	}
 		}
         }
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
 
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m',$header,$received) ) {
-		$k=0;
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m', $header, $received)) {
+		$k = 0;
+		for ($i = count($received[0])-1; $i>=0; $i--) {
 			foreach ($ARhosts as $mx) {
 				if ($mx == $received['host'][$i]) {
 					/* This is a trusted AR result */
-					$result['spf']['result']=$received['spf'][$i];
+					$result['spf']['result'] = $received['spf'][$i];
 					$result['spf']['dom'] = $received['SPFfrom'][$i];
 					$k++;
                         	}
                 	}
         	}
 	}
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
 
-	$k=0;
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+	$k = 0;
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m', $header, $received)) {
+		for ($i = count($received[0])-1; $i>=0; $i--) {
 	                foreach ($ARhosts as $mx) {
         	                if ($mx == $received['host'][$i]) {
                 	                /* This is a trusted AR result */
-                        	        $result['dkim']['result']=$received['dkim'][$i];
+                        	        $result['dkim']['result'] = $received['dkim'][$i];
                                 	$result['dkim']['dom'] = $received['DKIMdom'][$i];
 					$k++;
                         	}
                 	}
         	}
 	}
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
 
 	if ($dpl) { /* Use Spamassassin Plugin */
-		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m',$header,$received) ) {
-			$result['spam']['status']=$received['spamstatus'][0];
+		if (preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m', $header, $received)) {
+			$result['spam']['status'] = $received['spamstatus'][0];
                 	$result['spam']['score'] = $received['score'][0];
 			$result['spam']['th'] = $received['th'][0];
 			$result['dspam']['type'] = $received['dtype'][0];
-			$result['dspam']['level'] =$received['dlevel'][0];
+			$result['dspam']['level'] = $received['dlevel'][0];
         	}
         	if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
 	}
 	else { /* Parse apart all DSPAM Header and calculate a level */
-		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m',$header,$received) ) {
-                        $result['spam']['status']=$received['spamstatus'][0];
+		if (preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m', $header, $received)) {
+                        $result['spam']['status'] = $received['spamstatus'][0];
                         $result['spam']['score'] = $received['score'][0];
                         $result['spam']['th'] = $received['th'][0];
 			if (count($received[0])>1)
-				$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
+				$result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
 		}
-		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1)
+		if (preg_match('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/', $header, $received) != 1)
 	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
 	        else
-                	$result['dspam']['type']=$received['result'];
+                	$result['dspam']['type'] = $received['result'];
 		$prob = NULL;
 		$conf = NULL;
-                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
+                if (preg_match('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/', $header, $received) != 1)
                         $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
 		else
 			$prob = $received['prob'];
-		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1)
+		if (preg_match('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/', $header, $received) != 1)
                         $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
 		else
 			$conf = $received['conf'];
-		$result['dspam']['level'] = dspamLevel($prob,$conf);
+		$result['dspam']['level'] = dspamLevel($prob, $conf);
 	}
-	$received=NULL;
-	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1)
+	$received = NULL;
+	if (preg_match('/\r\nFrom:\s(?P<from>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'From header invalid or not present';
         else
                 $result['from'] = $received['from'];
 
-        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
+        if (preg_match('/\r\nDate:\s(?P<date>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'Date header invalid or not present';
 	else
 		$result['date'] = $received['date'];
 
-	$received=NULL;
-        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
+	$received = NULL;
+        if (preg_match('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
 	else
-		$result['messageid']=$received['mid'];
+		$result['messageid'] = $received['mid'];
 
-        $received=NULL;
+        $received = NULL;
 
         switch ($learn) {
 		case 'dspamc':
-        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
+        		if (preg_match('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/', $header, $received) != 1)
 				$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
 			else
-				$result['dspam']['learn']=$received['sig'];			
+				$result['dspam']['learn'] = $received['sig'];			
 			break;
 		case false:
 			break;
 		default:
-			syslog (LOG_INFO,$user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
+			syslog(LOG_INFO, $user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
 	}
 	
         return $result;
@@ -217,7 +217,7 @@ 
 
 
 
-function printTableHeader($title,$content,$footer=FALSE,$fcontent) {
+function printTableHeader($title, $content, $footer = FALSE, $fcontent) {
         print <<<END
 	<caption>$title</caption>
 	<thead>
@@ -225,21 +225,19 @@ 
 END;
 	$kcontent = array_keys($content);
         $cols = count($kcontent);
-        for ($i=0; $i<$cols; $i++) {
+        for ($i = 0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-                printf ('<th colspan="%d" rowspan="%d">%s</th>',
-			!is_array($content[$key]) ?:
-			count(array_keys($content[$key])) ?: '1',
-			!is_array($content[$key]) ?:
-			empty(array_keys($content[$key])) ? '2' : '1',
+                printf('<th colspan="%d" rowspan="%d">%s</th>',
+			!is_array($content[$key]) ?: count(array_keys($content[$key])) ?: '1',
+			!is_array($content[$key]) ?: empty(array_keys($content[$key])) ? '2' : '1',
 			$kcontent[$i]);
 	}
 	print '</tr><tr>';
-	for ($i=0; $i<$cols; $i++) {
+	for ($i = 0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-		if (is_array($content[$key])&&($hs = array_keys($content[$key]))) {
+		if (is_array($content[$key]) && ($hs = array_keys($content[$key]))) {
 			foreach ($hs as $h)
-				printf('<th>%s</th>',$h);
+				printf('<th>%s</th>', $h);
 		}
 	}
 		
@@ -255,7 +253,7 @@ 
 
 function formatVal($val, $learn) {
 	foreach (array_keys($val) as $key) {
-		if (is_array($val["$key"]) and ($key!='warn'))
+		if (is_array($val["$key"]) and ($key != 'warn'))
 			$val["$key"] = formatVal($val["$key"], $learn);
 		else {
 			switch ($key) {
@@ -263,7 +261,7 @@ 
 					if (empty($val["$key"]))
 						$val["$key"] = '-';
 					else 
-						$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+						$val["$key"] = sprintf('<div title="%s">Y</div>', implode($val["$key"], "\n"));
 					break;
 				case 'learn':
 					$val["$key"] = formLearn($learn, $val);
@@ -285,26 +283,26 @@ 
 				$par['class'] = $class;
 				$val["$class"] = sprintf('dspamc --user dspam --deliver=summary --class=%s --source=error --signature=%s',
 							strtolower($class), $par['learn']);
-				if (($class != $par['type'])||($par['level']<99))
+				if (($class != $par['type']) || ($par['level']<99))
 					$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
-						$class,$class,$val["$class"],base64_encode(json_encode($par)),$class);
+						$class, $class, $val["$class"], base64_encode(json_encode($par)), $class);
 			}
 		default:
 			return $return;
 	}
 }
 
-function printTableRow($row, $learn, $init=true) {
+function printTableRow($row, $learn, $init = true) {
 	$color = 'inherit';
 	if ($init) 
-		$row=formatVal($row,$learn);
-	foreach( $row as $key => $val) {
+		$row = formatVal($row, $learn);
+	foreach ($row as $key => $val) {
 		if (is_array($val))
 			printTableRow($val, $learn, false);
 		else {
 			/* DSPAM format */
 			if (isset($row['type']))
-				switch($row['type']) {
+				switch ($row['type']) {
 					case 'Innocent':
 					case 'HAM':
 						$color = 'rgba(0,255,0, %.1f)';
@@ -315,7 +313,7 @@ 
 			}
 			/* DMARC, DKIM, SPF format */
 			if (isset($row['result']))
-				switch($row['result']) {
+				switch ($row['result']) {
 					case 'pass':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -324,7 +322,7 @@ 
 				}
 			/* Spamassassin format */
 			if (isset($row['status']))
-	                        switch($row['status']) {
+	                        switch ($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -332,9 +330,9 @@ 
 						$color = 'rgba(255,0,0,%.1f)';
 				}	
 				
-			$alpha = (is_numeric($val)AND($key=='type')) ? round($val/100,1) : 1.0;
+			$alpha = (is_numeric($val) AND ($key == 'type')) ? round($val / 100, 1) : 1.0;
 			$bg = sprintf(" style=\"background-color: $color\"", $alpha);		
-			printf ('<td%s>%s</td>',$bg, $val);
+			printf('<td%s>%s</td>', $bg, $val);
 		}
 	}
 }

contrib/mailClassifier/result.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 include_once($path.'config.php');
 require_once($path.'function.php');
 
@@ -14,14 +14,14 @@ 
 $tag .= $conf['syslog']['tag'];
 openlog($tag, LOG_PID, $fac);
 
-if ( $confimap['learn']=='dspamc' ) {
+if ($confimap['learn'] == 'dspamc') {
 	$cmd = escapeshellcmd('which dspamc');
 	$cmd = escapeshellcmd('which ls');
-	exec ( $cmd, $out, $ret );
+	exec($cmd, $out, $ret);
 	if ($ret != 0) {
 		$err = 'No DSPAM Client found on your system. Please, force your sysadmin to install "dspamc".';
 		syslog(LOG_ERR, $username.': Error: '.$err);
-		exit (sprintf('<p>%s</p>',htmlentities($err)));
+		exit (sprintf('<p>%s</p>', htmlentities($err)));
 	}
 }
 
@@ -60,10 +60,10 @@ 
 $headers = imapFind($confimap, $account, $folder);
 if (empty($headers)) exit (sprintf('<p>No suitable mail found in <b>%s</b> folder.</p>', htmlentities("<$folder>")));
 print '<table>';
-printTableHeader($folder,$data,TRUE,sprintf('Found %d suitable mails.',count($headers)));
+printTableHeader($folder, $data, TRUE, sprintf('Found %d suitable mails.', count($headers)));
 
-foreach ( $headers AS $header ) {
-	$values = imapInfo($username, $header,$conf['host']['ar'],$confimap['dspamtospamass'],$confimap['learn']);
+foreach ($headers AS $header) {
+	$values = imapInfo($username, $header, $conf['host']['ar'], $confimap['dspamtospamass'], $confimap['learn']);
 	print '<tr>';
 	printTableRow($values, $confimap['learn']);
 	print '</tr>';