falon / RBL

listForm.php

Braces +8 added lines, -5 removed lines

@@ -1,11 +1,14 @@
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-else $extopt = NULL;
+if (in_array($user,array_keys(array_filter($adm)))) {
+	$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+} else {
+	$extopt = NULL;
+}
 
 if ( $tables["$typedesc"]['milter'] ) {
-	if ( checkMilterConf($tables["$typedesc"]) ) 
-		print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>';
-	else {
+	if ( checkMilterConf($tables["$typedesc"]) ) {
+			print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>';
+	} else {
 		$err = "Error in config about <$typedesc>. Check at your config.php.";
 		syslog (LOG_EMERG, $err);
 		printf ('<p>%s</p>', htmlspecialchars($err) );

relist.php

Braces +13 added lines, -6 removed lines

@@ -9,19 +9,26 @@
 <td colspan="<?php echo $cl; ?>" style="text-align: center">
 <?php
 openlog($tag, LOG_PID, $fac);
-if (empty($_POST['reason'])) die ("Specify a reason, please!</td>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
+if (empty($_POST['reason'])) {
+	die ("Specify a reason, please!</td>");
+}
+if (preg_match( '/[^\x20-\x7f]/', $_POST['reason'])) {
         exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+}
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
                 exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 
-if (isFull($mysqli,$typedesc,$tables)) die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
-if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (isFull($mysqli,$typedesc,$tables)) {
+	die("ERROR in relist: ".htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.') );
+}
+if (relist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason'])) {
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; relisted for '.$_POST['quantity'].$_POST['unit'];
-else
+} else {
  print 'ERROR in relist; check log';
+}
 $mysqli->close();
 closelog();
 print '</td>';

result.php

Braces +28 added lines, -16 removed lines

@@ -5,32 +5,39 @@ 
 $net = new \dautkom\ipv4\IPv4();
 
 $_ = $_POST['genere'];
-if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') ) {
         if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid domain.</pre>');
+}
 
-if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') )
+if ( ($tables["$_"]['field']=='ip')  AND ($_POST['Value']!='ALL') ) {
 	if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)))
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid IP address.</pre>');
+}
 	
 if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) {
 	$value = explode('/',$_POST['Value']);
-	if (count($value) != 2)
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
-	if (!$net->address($value[0])->mask($value[1])->isValid(1))
-		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
+	if (count($value) != 2) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask pair.</pre>');
+	}
+	if (!$net->address($value[0])->mask($value[1])->isValid(1)) {
+			exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid Network/Netmask.</pre>');
+	}
 	$_POST['Value'] = $value[0].'/'.$net->mask($value[1])->convertTo('dec');
 }
 
 if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
-                exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
-	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) )
-		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) ) {
+                        exit('<pre>&lt;'.$_POST['Value'].'&gt; contains NON ASCII chars.</pre>');
+        }
+	if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) ) {
+			exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
+	}
 	switch ( $_POST['Value'] ) {
 		case 'anonymous':
 		case 'anybody':
@@ -41,18 +48,23 @@ 
 }	
 
 if (empty($_GET)) {
-	if ($tables["$_"]['milter']) print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
-	else {
-		if ($tables["$_"]['bl']) print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
-		else                     print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
+	if ($tables["$_"]['milter']) {
+		print "<p><i>$_</i> is a miltermap of ".$tables["$_"]['field'].'.</p>';
+	} else {
+		if ($tables["$_"]['bl']) {
+			print "<p><i>$_</i> is a blocklist of ".$tables["$_"]['field'].'.</p>';
+		} else {
+			print "<p><i>$_</i> is a whitelist of ".$tables["$_"]['field'].'.</p>';
+		}
 	}
 }
 
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE ) {
 	exit ('Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 	
 rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
 $mysqli->close();

list.php

Braces +13 added lines, -6 removed lines

@@ -6,20 +6,27 @@
 $table = ($tables["$typedesc"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
 
 openlog($tag, LOG_PID, $fac);
-if (empty($_POST['reason'])) die ("<p>Please, specify a reason!</p>");
-if (preg_match( '/[^\x20-\x7f]/', $_POST['reason']))
+if (empty($_POST['reason'])) {
+	die ("<p>Please, specify a reason!</p>");
+}
+if (preg_match( '/[^\x20-\x7f]/', $_POST['reason'])) {
 	exit('<p>ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</p>');
+}
 $user = username();
 $err = NULL;
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
                 exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 
-if (addtolist ($mysqli,$user,$_POST['value'],$tables["$typedesc"],$_POST['unit'],$_POST['quantity'],$_POST['reason'],$err))
+if (addtolist ($mysqli,$user,$_POST['value'],$tables["$typedesc"],$_POST['unit'],$_POST['quantity'],$_POST['reason'],$err)) {
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; first time listed for '.$_POST['quantity'].$_POST['unit'].'.';
-else
+} else {
  print 'List operation ERROR; check log.';
-if (!is_null($err) ) print htmlentities(' Error: ' . $err);
+}
+if (!is_null($err) ) {
+	print htmlentities(' Error: ' . $err);
+}
 $mysqli->close();
 closelog();
 ?>

remove.php

Braces +5 added lines, -3 removed lines

@@ -9,12 +9,14 @@
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
                 exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
-if (remove ($mysqli,$user,$_POST['value'],$type,$table))
+}
+if (remove ($mysqli,$user,$_POST['value'],$type,$table)) {
  print 'OK '.$typedesc.' <'.$_POST['value'].'> permanently REMOVED!';
-else
+} else {
  print 'Delete operation ERROR on '.$typedesc.' <'.$_POST['value'].'>; check log.';
+}
 print '</td>';
 $mysqli->close();
 closelog();

relistForm.php

Braces +5 added lines, -2 removed lines

@@ -1,7 +1,10 @@
 <?php
 $adm = unserialize($_POST["adm"]);
-if (in_array($_POST["user"],array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
-else $extopt = NULL;
+if (in_array($_POST["user"],array_keys(array_filter($adm)))) {
+	$extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+} else {
+	$extopt = NULL;
+}
 
 require_once('config.php');
 $typedesc=$_POST['type'];

delist.php

Braces +5 added lines, -3 removed lines

@@ -11,13 +11,15 @@
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
+if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
                 exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+}
 
-if (changestatus($mysqli,username(),$_POST['value'],'0',$type,$table))
+if (changestatus($mysqli,username(),$_POST['value'],'0',$type,$table)) {
  print 'OK '.$_POST["type"].' <'.$_POST['value'].'> delisted.';
-else
+} else {
  print 'ERROR in delist <'.$_POST['value'].'>; check log';
+}
 print '</td>';
 $mysqli->close();
 closelog();

contrib/splunk/webhook/readPost.php

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($host, $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 exceedes limits on outgoing emails',
                                                                 $tables["$typedesc"]['field'], $value);
-                                                if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+                                                if (!empty($recip)) {
+                                                                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
                                                                 $subject,$value,"$quantity $unit",$reason) )
                                                                 syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+                                                }
+                                        } else {
+                                        	syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                         }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                 }
                         }
                 }
-        }
-        else {
+        } else {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
                 syslog (LOG_INFO, "$user: ".$reason);
         }

index.php

Braces +4 added lines, -2 removed lines

@@ -14,12 +14,14 @@
 require_once('function.php');
 
 checkSSL();
-if ( $require_auth )
+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
 <form name="check" action="result.php" onSubmit="xmlhttpPost('result.php', 'check', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" enctype="text/plain" method="post" target="_self">