falon / RBL

contrib/rbldns/exportdns.php

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

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

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,15 +87,15 @@ 
 	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:
+								  case 'ip':
+										$element[] = long2ip($riga['ip']);
+										break;
+								  case 'network':
+										$element[] = long2ip($riga['network']).'/'.long2ip($riga['netmask']);
+										break;
+								  default:
 					$type = $tables["$typedesc"]['field'];
-                                        $element[] = $riga["$type"];
+										$element[] = $riga["$type"];
 			}
 		}
 	}

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/expire.php

Indentation +4 added lines, -4 removed lines

@@ -15,10 +15,10 @@
 openlog($tag, LOG_PID, $fac);
 $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);
+			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 );

Spacing +4 added lines, -4 removed lines

@@ -15,15 +15,15 @@
 openlog($tag, LOG_PID, $fac);
 $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);
 
-expire($mysqli,$user,$tables,$expireTime);
+expire($mysqli, $user, $tables, $expireTime);
 $mysqli->close();
 closelog();
 ?>

lookup.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 <h1> DNSBL Lookup</h1> 
 <?php
 
-$_POST['Value'] = str_replace('_','.',array_keys($_GET)[0]);
+$_POST['Value'] = str_replace('_', '.', array_keys($_GET)[0]);
 $_POST['genere'] = 'Spam IP';
 require_once('result.php');
 ?>

changeMilter.php

Indentation +3 added lines, -3 removed lines

@@ -44,8 +44,8 @@ 
 	}
 	if (! empty($old) ) {
 		foreach ($old as $item) {
-        		if (! in_array($item, $new) ) {
-                		$values["$item"] = 'del';
+				if (! in_array($item, $new) ) {
+						$values["$item"] = 'del';
 				$logs[] = "<$item>: ". $values["$item"];
 			}
 		}
@@ -63,7 +63,7 @@ 
 	
 	/* 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);
+			exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
 
 	if (changeMilter ($mysqli,$user,$values,$col,$_POST['miltId']))
 		print 'OK milter setting changed.';

Spacing +18 added lines, -18 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$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">
@@ -18,54 +18,54 @@ 
 	$new = $_POST['newvalues'];
 else
 	$new = array();
-if (! empty($_POST['oldvalues']))
+if (!empty($_POST['oldvalues']))
 	$old = explode(',', $_POST['oldvalues']);
 else
-	$old=array();
-$values=array();
-$logs=array();
+	$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) ) {
+	if (!empty($new)) {
 		foreach ($new as $item) {
-			if ( in_array($item, $old) )
+			if (in_array($item, $old))
 				$values["$item"] = 'keep';
 			else
 				$values["$item"] = 'add';
-			$logs[] = "<$item>: ". $values["$item"];
+			$logs[] = "<$item>: ".$values["$item"];
 		}
 	}
-	if (! empty($old) ) {
+	if (!empty($old)) {
 		foreach ($old as $item) {
-        		if (! in_array($item, $new) ) {
+        		if (!in_array($item, $new)) {
                 		$values["$item"] = 'del';
-				$logs[] = "<$item>: ". $values["$item"];
+				$logs[] = "<$item>: ".$values["$item"];
 			}
 		}
 	}
 }
 
 /* Logging */
-if ( empty($values) ) 
+if (empty($values)) 
 	print 'No values to change.';
 else {
-	$msg = sprintf('%s: Changing Milter setting on list <%s> for %s <%s>.',$user,$typedesc,$type, $_POST['object']);
+	$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");
 	
 	/* 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']))
+	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.';

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

Spacing +6 added lines, -6 removed lines

@@ -1,14 +1,14 @@ 
 <?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;
 
-if ( $tables["$typedesc"]['milter'] ) {
-	if ( checkMilterConf($tables["$typedesc"]) ) 
+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 {
 		$err = "Error in config about <$typedesc>. Check at your config.php.";
-		syslog (LOG_EMERG, $err);
-		printf ('<p>%s</p>', htmlspecialchars($err) );
+		syslog(LOG_EMERG, $err);
+		printf('<p>%s</p>', htmlspecialchars($err));
 	}	
 }
 
@@ -16,4 +16,4 @@ 
 <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>

relist.php

Indentation +2 added lines, -2 removed lines

@@ -11,11 +11,11 @@
 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();
 
 if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-                exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+				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']))

Spacing +7 added lines, -7 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"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
 $cl = ($tables["$typedesc"]['milter']) ? 10 : 9;
@@ -10,15 +10,15 @@ 
 <?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();
 
-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 (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';

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

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 $err = NULL;
 
 if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-                exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+				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))
  print 'OK '.$_POST["type"].' <'.$_POST['value'].'> first time listed for '.$_POST['quantity'].$_POST['unit'].'.';

Spacing +7 added lines, -7 removed lines

@@ -1,25 +1,25 @@
 <?php
 require_once('config.php');
 require_once('function.php');
-$typedesc=$_POST['type'];
+$typedesc = $_POST['type'];
 $type = $tables["$typedesc"]['field'];
 $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']))
-	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();
 $err = NULL;
 
-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 (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
  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();
 ?>

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

Indentation +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 $user = username();
 
 if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user)) === FALSE )
-                exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
+				exit ($user.': Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error);
 if (remove ($mysqli,$user,$_POST['value'],$type,$table))
  print 'OK '.$typedesc.' <'.$_POST['value'].'> permanently REMOVED!';
 else

Spacing +5 added lines, -5 removed lines

@@ -1,17 +1,17 @@
 <?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"]['milter']) ? milterTable($type) : $tables["$typedesc"]['name'];
 $cl = ($tables["$typedesc"]['milter']) ? 10 : 9;
 printf('<td colspan="%d" style="text-align: center">', $cl);
 openlog($tag, LOG_PID, $fac);
 $user = username();
 
-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 (($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))
  print 'OK '.$typedesc.' &lt;'.$_POST['value'].'&gt; permanently REMOVED!';
 else
  print 'Delete operation ERROR on '.$typedesc.' &lt;'.$_POST['value'].'&gt;; check log.';

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