falon / RBL

result.php

Indentation +7 added lines, -7 removed lines

@@ -10,7 +10,7 @@ 
 		exit ('<pre>&lt;'.$_POST['Value'].'&gt; is NOT a valid email address.</pre>');
 
 if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') )
-        if (!(filter_var(gethostbyname($_POST['Value']), FILTER_VALIDATE_IP)))
+		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') )
@@ -26,8 +26,8 @@ 
 }
 
 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( '/[^\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'] ) {
@@ -49,10 +49,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;

Braces +25 added lines, -15 removed lines

@@ -5,31 +5,38 @@ 
 $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>');
+	}
+	}
 
 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':
@@ -40,9 +47,12 @@ 
 }	
 
 if (empty($_GET)) {
-	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["$_"]['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();

index.php

Braces +5 added lines, -2 removed lines

@@ -14,11 +14,14 @@
 require_once('function.php');
 
 
-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
 <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">

remove.php

Indentation +3 added lines, -3 removed lines

@@ -10,9 +10,9 @@
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
 	syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-        die($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+					. $mysqli->connect_error);
+		die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 

Braces +3 added lines, -2 removed lines

@@ -16,10 +16,11 @@
 }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
-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.';
+}
 $mysqli->close();
 closelog();
 ?>

list.php

Indentation +6 added lines, -6 removed lines

@@ -12,12 +12,12 @@
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
-        if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            die($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-        }
+		if ($mysqli->connect_error) {
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+		}
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
 if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))

Braces +8 added lines, -4 removed lines

@@ -6,9 +6,12 @@ 
 $table = $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();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
@@ -20,10 +23,11 @@ 
         }
 syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
 
-if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason']))
+if (addtolist ($mysqli,username(),$_POST['value'],$type,$table,$_POST['unit'],$_POST['quantity'],$_POST['reason'])) {
  print 'OK '.$_POST["type"].' &lt;'.$_POST['value'].'&gt; first time listed for '.$_POST['quantity'].$_POST['unit'].'.';
-else
+} else {
  print 'List operation ERROR; check log.';
+}
 $mysqli->close();
 closelog();
 ?>

relist.php

Indentation +6 added lines, -6 removed lines

@@ -2,23 +2,23 @@
 require_once('config.php');
 require_once('function.php');
 $typedesc=$_POST['type'];
-        $type = $tables["$typedesc"]['field'];
-        $table = $tables["$typedesc"]['name'];
+		$type = $tables["$typedesc"]['field'];
+		$table = $tables["$typedesc"]['name'];
 ?>
 <td colspan="9" 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']))
-        exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
+		exit('ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</td>');
 $user = username();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
 	syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-        	. $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
 

Braces +11 added lines, -5 removed lines

@@ -8,9 +8,12 @@ 
 <td colspan="9" 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();
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
@@ -22,11 +25,14 @@ 
 }
 syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
 
-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>';

listForm.php

Braces +5 added lines, -2 removed lines

@@ -1,6 +1,9 @@
 <?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;
+}
 ?>
 <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php"  onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" />
 

contrib/splunk/listFromSplunk.php

Braces +21 added lines, -12 removed lines

@@ -12,8 +12,12 @@ 
 
 $shortopts = "c:";  // Required value
 $options = getopt($shortopts);
-if ( !isset($options['c']) ) exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
-if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+if ( !isset($options['c']) ) {
+	exit ("\n\nUSAGE: ${_SERVER['SCRIPT_NAME']} -c <file.conf>\n\n");
+}
+if ( !file_exists(dirname(__FILE__) . '/' . $options['c']) ) {
+	exit ("\n\nThe file <".$options['c']."> doesn't exists.\nExiting...\n\n");
+}
 
 /************** Start of conf ************************/
 require_once('config.php');
@@ -77,14 +81,18 @@ 
         $row = -1;
         while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
                 $row++;
-                if ($row == 0) continue; /* Skip heading line */
+                if ($row == 0) {
+                	continue;
+                }
+                /* Skip heading line */
                 $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;
+                }
         }
         fclose($handle);
 }
@@ -115,17 +123,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);
 	}

Indentation +34 added lines, -34 removed lines

@@ -47,8 +47,8 @@ 
 
 /* check you select a blocklist */
 if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
-        exit (254);
+		syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+		exit (254);
 }
 
 
@@ -68,33 +68,33 @@ 
 $tolist = array();
 
 if ( !file_exists($splfile) ) {
-        syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
-        exit (254);
+		syslog(LOG_ERR,"$user: File <$splfile> not found! Exit.");
+		exit (254);
 }
 
 if (($handle = gzopen($splfile, 'r')) !== FALSE) {
-        $row = -1;
-        while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
-                $row++;
-                if ($row == 0) continue; /* Skip heading line */
-                $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;
-        }
-        fclose($handle);
+		$row = -1;
+		while (($data = fgetcsv($handle, 500, ',')) !== FALSE) {
+				$row++;
+				if ($row == 0) continue; /* Skip heading line */
+				$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;
+		}
+		fclose($handle);
 }
 
 /* Make MYSQL connection */
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-        syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-        . $mysqli->connect_error);
-        exit (254);
+		syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+		. $mysqli->connect_error);
+		exit (254);
 
 }
 
@@ -103,28 +103,28 @@ 
 foreach ( array_keys($tolist) as $value) {
 	$quantity = $conf['quantity'];
 	$reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
-                        /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+		if ( $tolist["$value"][3] >= $threshold ) {
+				if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
+						syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+						/* Send a email to domain admin if you list an email */
+						if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
 				/* Sometime uid are in the form of <user>@<domain> ... */
 				if ( strpos($value, '@') !== FALSE ) {
-                                	$domain = array_pop(explode('@',$value,2));
+									$domain = array_pop(explode('@',$value,2));
 					if ( strpos($domain, '@') === FALSE ) {
-                                		$recip = emailToNotify($domainNotify_file,$domain);
-                                		$subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
+										$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.");
+														syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
 					}
 					else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
 				}
-                        }
-                }
-        }
+						}
+				}
+		}
 	else {
 		$reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
 		syslog (LOG_INFO, "$user: ".$reason);

contrib/rbldns/exportdns.php

Indentation +23 added lines, -23 removed lines

@@ -2,7 +2,7 @@ 
 <?php
 
 if (PHP_SAPI != "cli")
-    exit;
+	exit;
 
 $home = '/var/www/html/RBL';
 require_once($home.'/config.php');
@@ -20,30 +20,30 @@ 
 
 $opts = getopt('f:t:');
 if ( isset($opts['f']) ) {
-        $filetemplate = $opts['f'];
+		$filetemplate = $opts['f'];
 } else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( isset($opts['t']) ) {
-        $tablename = $opts['t'];
+		$tablename = $opts['t'];
 } else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
-        print "\nDB <$tablename> doesn't exist!\n";
-        syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
-        exit ( usage() );
+		print "\nDB <$tablename> doesn't exist!\n";
+		syslog (LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+		exit ( usage() );
 }
 $typedesc = array_keys($tables)[$typedescN];
 
 if (! file_exists($filetemplate) ) {
-        print "\nFile <$filetemplate> doesn't exists!\n";
+		print "\nFile <$filetemplate> doesn't exists!\n";
 	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+		exit ( usage() );
 }
 
 if (! in_array( $typedesc, array_keys($tables) ) ) {
@@ -53,7 +53,7 @@ 
 
 if (! $tables["$typedesc"]['active'] ) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+		exit ( usage() );
 }
 
 
@@ -73,10 +73,10 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
-                    . $mysqli->connect_error);
+			syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+					. $mysqli->connect_error);
 }
 
 syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
@@ -87,14 +87,14 @@ 
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
 			switch ( $tables["$typedesc"]['field'] ) {
-                                  case 'ip':
-                                        $element[] = long2ip($riga['ip']);
-                                        break;
-                                  case 'network':
-                                        $element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
-                                        break;
-                                  default:
-                                        $element[] = $riga["$type"];
+								  case 'ip':
+										$element[] = long2ip($riga['ip']);
+										break;
+								  case 'network':
+										$element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
+										break;
+								  default:
+										$element[] = $riga["$type"];
 			}
 		}
 	}

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

contrib/ipImap/report/result.php

Indentation +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
 foreach($dir as $file)
 {
-        if ( basename($file) != basename(__FILE__) ) {
+		if ( basename($file) != basename(__FILE__) ) {
 		$modalDiv = 'openModal'.basename($file);
 		echo '<li><a href="#'.$modalDiv.'">'.str_replace("-$theDate.html",'',basename($file)).'</a></li>';
 #                echo '<li><pre><a href="'.basename($file).'" title="'.str_replace("-$theDate.html",'',basename($file))." of $theDate".'" onClick="Modalbox.show(this.href, {title: this.title, height: 600}); return false;">'.str_replace("-$theDate.html",'',basename($file)).'</a></pre></li>';