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

Spacing +14 added lines, -14 removed lines

@@ -5,36 +5,36 @@ 
 $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 (($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 ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) {
-        if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) )
+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']) )
+	if (preg_match('/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']))
 		exit('<pre>&lt;'.$_POST['Value'].'&gt; contains invalid ASCII chars.</pre>');
-	switch ( $_POST['Value'] ) {
+	switch ($_POST['Value']) {
 		case 'anonymous':
 		case 'anybody':
 		case 'anyone':
-		case ( preg_match( '/^anyone@/',$_POST['Value']) == TRUE ):
+		case (preg_match('/^anyone@/', $_POST['Value']) == TRUE):
 			exit('<pre>&lt;'.$_POST['Value'].'&gt; is not allowed.</pre>');
 	}
 }	
@@ -49,14 +49,14 @@ 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
 
-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
-rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables);
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
+rlookup($mysqli, username(), $admins, $_POST['Value'], $_POST['genere'], $tables);
 $mysqli->close();
 closelog();
 ?>

index.php

Spacing +4 added lines, -4 removed lines

@@ -14,10 +14,10 @@ 
 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
@@ -26,10 +26,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>";
 	}
 

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

Spacing +6 added lines, -6 removed lines

@@ -1,22 +1,22 @@
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
-$type =  $tables["$typedesc"]['field'];
+$typedesc = $_POST['type'];
+$type = $tables["$typedesc"]['field'];
 $table = $tables["$typedesc"]['name'];
 
 openlog($tag, LOG_PID, $fac);
 $user = username();
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-	syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+	syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-        die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+        die($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
+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.' &lt;'.$_POST['value'].'&gt; permanently REMOVED!';
 else
  print 'Delete operation ERROR on '.$typedesc.' &lt;'.$_POST['value'].'&gt;; check log.';

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

Spacing +7 added lines, -7 removed lines

@@ -1,26 +1,26 @@
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $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']))
-	exit('<p>ERROR: &lt;'.htmlentities($_POST['reason'],ENT_COMPAT | ENT_HTML401, 'ISO-8859-1').'&gt; contains NON ASCII chars.</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);
         if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            die($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            die($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
         }
-syslog (LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info );
+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
  print 'List operation ERROR; check log.';

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

Spacing +8 added lines, -8 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
 ?>
@@ -9,21 +9,21 @@ 
 <?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>');
+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);
 if ($mysqli->connect_error) {
-	syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+	syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
         	. $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
-syslog(LOG_INFO, $user.': Successfully connected to ' . $mysqli->host_info) ;
+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
  print 'ERROR in relist; check log';

listForm.php

Spacing +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php
-if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>';
+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;" />
 
 		List <?php  echo $typedesc.' &lt;'.$value.'&gt;'; ?> for <input name="type" type="hidden" value="<?php echo $typedesc; ?>" /><input name="value" type="hidden" class="input_text" value="<?php echo $value; ?>" />
-		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt;?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>
+		<select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt; ?></select>  Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form>

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"];
 			}
 		}
 	}

Spacing +26 added lines, -26 removed lines

@@ -19,74 +19,74 @@ 
 $user = username();
 
 $opts = getopt('f:t:');
-if ( isset($opts['f']) ) {
+if (isset($opts['f'])) {
         $filetemplate = $opts['f'];
-} else {
+}else {
 	print "\nNo option for '-f' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( isset($opts['t']) ) {
+if (isset($opts['t'])) {
         $tablename = $opts['t'];
-} else {
+}else {
 	print "\nNo option for '-t' given.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
-if ( ($typedescN = array_search( $tablename, array_column($tables, 'name'))) === FALSE ) {
+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() );
+        syslog(LOG_EMERG, "$user: DB <$tablename> doesn't exist!");
+        exit (usage());
 }
 $typedesc = array_keys($tables)[$typedescN];
 
-if (! file_exists($filetemplate) ) {
+if (!file_exists($filetemplate)) {
         print "\nFile <$filetemplate> doesn't exists!\n";
-	syslog (LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
-        exit ( usage() );
+	syslog(LOG_EMERG, "$user: File <$filetemplate> doesn't exist!");
+        exit (usage());
 }
 
-if (! in_array( $typedesc, array_keys($tables) ) ) {
+if (!in_array($typedesc, array_keys($tables))) {
 	print "\nUnknown list <$typedesc>. Please provide an existent list name.\n";
-	exit ( usage() );
+	exit (usage());
 }
 
-if (! $tables["$typedesc"]['active'] ) {
+if (!$tables["$typedesc"]['active']) {
 	print "\nList <$typedesc> is not active. Please provide an active list name.\n";
-        exit ( usage() );
+        exit (usage());
 }
 
 
 
-$now=new DateTime('NOW');
+$now = new DateTime('NOW');
 $timeunix = $now->format('U');
 $dateRFC822 = $now->format('r');
 $year = $now->format('Y');
-$rbltype= ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
+$rbltype = ($tables["$typedesc"]['bl']) ? 'Blocklist' : 'Whitelist';
 
 
 $tmpl = file_get_contents($filetemplate);
-$arr_tpl_vars = array('{rblname}','{rbltype}','{date822}','{year}','{unixtimestamp}','{rblname64}','{hostname}');
-$arr_tpl_data = array($typedesc,$rbltype,$dateRFC822,$year,$timeunix,base64_encode($typedesc),gethostname());
+$arr_tpl_vars = array('{rblname}', '{rbltype}', '{date822}', '{year}', '{unixtimestamp}', '{rblname64}', '{hostname}');
+$arr_tpl_data = array($typedesc, $rbltype, $dateRFC822, $year, $timeunix, base64_encode($typedesc), gethostname());
 $headerList = str_replace($arr_tpl_vars, $arr_tpl_data, $tmpl);
 
 
 $mysqli = new mysqli($dbhost, $userdb, $pwd, $db, $dbport);
 if ($mysqli->connect_error) {
-            syslog (LOG_EMERG, $user.': Connect Error (' . $mysqli->connect_errno . ') '
+            syslog(LOG_EMERG, $user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
-            exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '
+            exit ($user.': Connect Error ('.$mysqli->connect_errno.') '
                     . $mysqli->connect_error);
 }
 
-syslog(LOG_INFO, $user.': Successfully mysql connected to ' . $mysqli->host_info) ;
+syslog(LOG_INFO, $user.': Successfully mysql connected to '.$mysqli->host_info);
 
-$result = searchentry ($mysqli,'ALL',$tables["$typedesc"]);
+$result = searchentry($mysqli, 'ALL', $tables["$typedesc"]);
 if ($result->num_rows) {
 	$element = array();
 	while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 		if (isListed($riga)) {
-			switch ( $tables["$typedesc"]['field'] ) {
+			switch ($tables["$typedesc"]['field']) {
                                   case 'ip':
                                         $element[] = long2ip($riga['ip']);
                                         break;
@@ -104,6 +104,6 @@ 
 $mysqli->close();
 
 /* Print to file */
-file_put_contents( $tables["$typedesc"]['name'], $headerList . implode("\n",$element) );
+file_put_contents($tables["$typedesc"]['name'], $headerList.implode("\n", $element));
 closelog();
 ?>

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

Spacing +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
 
 
 print '<p>List of available Reports for '.date('l, d M Y', strtotime($theDate)).'</p><ul>';
-foreach($dir as $file)
+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><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>';
 		print <<<MODAL
 <div id="$modalDiv" class="overlay">

contrib/ipImap/report/index.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 <?php
 $reports = array();
 foreach (glob("*.{htm,html}", GLOB_BRACE) as $filename) {
-    $reports[$filename] = filemtime($filename);
+	$reports[$filename] = filemtime($filename);
 }
 arsort($reports);
 $newest = array_shift($reports);

Spacing +2 added lines, -2 removed lines

@@ -31,9 +31,9 @@
 /* Write Calendar */
 	  $myCalendar = new tc_calendar("calSpam");
 	  $myCalendar->setIcon("calendar/images/iconCalendar.gif");
-	  $myCalendar->setDate(date('d',$newest), date('m',$newest), date('Y',$newest));
+	  $myCalendar->setDate(date('d', $newest), date('m', $newest), date('Y', $newest));
 	  $myCalendar->setPath("calendar/");
-	  $myCalendar->setYearInterval(date('Y',$oldest), date('Y', $newest));
+	  $myCalendar->setYearInterval(date('Y', $oldest), date('Y', $newest));
 	  $myCalendar->dateAllow(date('Y-m-d', $oldest), date('Y-m-d', $newest));
 	  $myCalendar->setDateFormat('j F Y');
 	  $myCalendar->startDate(1);