falon / RBL

contrib/rbldns/exportdns.php

Braces +2 added lines, -1 removed lines

@@ -1,8 +1,9 @@
 #!/usr/bin/php
 <?php
 
-if (PHP_SAPI != "cli")
+if (PHP_SAPI != "cli") {
     exit;
+}
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');

changeMilter.php

Braces +28 added lines, -20 removed lines

@@ -4,8 +4,9 @@ 
 $typedesc=$_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $col = milterTable($type);
-if ( $col === FALSE )
+if ( $col === FALSE ) {
 	exit ("<p>Error in you config at field <b>$type</b>.</p>");
+}
 ?>
 <td colspan="10" style="text-align: center">
 
@@ -14,31 +15,35 @@ 
 $user = $_POST['user'];
 
 /* Compare old values with new ones */
-if (isset($_POST['newvalues']))
+if (isset($_POST['newvalues'])) {
 	$new = $_POST['newvalues'];
-else
+} else {
 	$new = array();
-if (! empty($_POST['oldvalues']))
+}
+if (! empty($_POST['oldvalues'])) {
 	$old = explode(',', $_POST['oldvalues']);
-else
+} else {
 	$old=array();
+}
 $values=array();
 $logs=array();
 
 print '<pre>';
 /* Check need to disable all milters, removing unnecessary setting */
-if ( in_array('DISABLE ALL', $new) )
+if ( in_array('DISABLE ALL', $new) ) {
 	$new = array('DISABLE ALL');
+}
 
 /* Compare the values determining what to do */
 if (count(array_diff(array_merge($new, $old), array_intersect($new, $old))) !== 0) {
 	/* New and old are different (we assume we don't have duplicate values) */
 	if (! empty($new) ) {
 		foreach ($new as $item) {
-			if ( in_array($item, $old) )
-				$values["$item"] = 'keep';
-			else
-				$values["$item"] = 'add';
+			if ( in_array($item, $old) ) {
+							$values["$item"] = 'keep';
+			} else {
+							$values["$item"] = 'add';
+			}
 			$logs[] = "<$item>: ". $values["$item"];
 		}
 	}
@@ -53,22 +58,25 @@ 
 }
 
 /* Logging */
-if ( empty($values) ) 
+if ( empty($values) ) {
 	print 'No values to change.';
-else {
+} else {
 	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
 	syslog(LOG_INFO, $msg);
-	foreach ($logs as $log)
-		syslog(LOG_INFO, "$user: milter $log");
+	foreach ($logs as $log) {
+			syslog(LOG_INFO, "$user: milter $log");
+	}
 	
 	/* Store new values */
-	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+	if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE ) {
+	        	exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+	}
 
-	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
-		print 'OK milter setting changed.';
-	else
-		print 'ERROR updating milter setting; check your syslog. No changes made.';
+	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId'])) {
+			print 'OK milter setting changed.';
+	} else {
+			print 'ERROR updating milter setting; check your syslog. No changes made.';
+	}
 
 	$mysqli->close();
 }

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>';

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);
         }