falon / RBL

contrib/ipImap/function.php

Braces +107 added lines, -61 removed lines

@@ -10,21 +10,25 @@ 
 	if ( preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m',$header,$received) ) {
 		for ($i = count($received[0])-1;$i>=0;$i--) {
 #			print "Examine ".$received[0][$i]."\n";
-			if ( preg_match($msa,$received['host'][$i]) )
-				$dateR = $received['date'][$i];
+			if ( preg_match($msa,$received['host'][$i]) ) {
+							$dateR = $received['date'][$i];
+			}
         		foreach ($mxserver as $mx) {
-        			if (!$ip)
-					if ($mx == $received['host'][$i]) {
+        			if (!$ip) {
+        								if ($mx == $received['host'][$i]) {
 						$host = $received['host'][$i];
+        			}
 						$ip = $received['ip'][$i];
                     			}
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
-		$dateC['date'] = 'Not found';
-	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1)
-		$mid['mid'] = NULL;
+	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1) {
+			$dateC['date'] = 'Not found';
+	}
+	if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1) {
+			$mid['mid'] = NULL;
+	}
 	return array($ip,$host,$dateR,$dateC['date'],$mid['mid']);
 }
 
@@ -40,7 +44,9 @@ 
 
 function summaryBadReport ($uidvet) {
         $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
+        if ( empty($uidvet) ) {
+        	return NULL;
+        }
         $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
 
         /* Remove count index */
@@ -75,8 +81,12 @@ 
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
             $k = substr($k,1);
-            if (!isset($ret[$k])) $ret[$k] = $array[$k];
-            if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
+            if (!isset($ret[$k])) {
+            	$ret[$k] = $array[$k];
+            }
+            if (isset ($array[$k][$col])) {
+            	$ret[$k][$col] = $array[$k][$col];
+            }
         }
     }
     return $ret;
@@ -87,13 +97,17 @@ 
 function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
 	$nips = $ipvet['count'];
 
-	if ( empty($ipvet) ) return NULL;
+	if ( empty($ipvet) ) {
+		return NULL;
+	}
 	$return = '<h3>Statistics by IP</h3><table><tr><th>IP</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this ip is currently listed, but it says if this IP has listed now!">Listed Now</th></tr>'."\n";
 	
 	$ips = array_keys($ipvet['ip']);
 
 	foreach ( $ips as $ip ) {
-		if ( $ip == 'count' ) continue;
+		if ( $ip == 'count' ) {
+			continue;
+		}
                 $nlearn = $ipvet['ip']["$ip"]['count'];
                 unset($ipvet['ip']["$ip"]['count']);
 		$quantity = $cf['quantity']["$category"]; /* In searchAndList this value is passed by reference and modified */
@@ -102,10 +116,12 @@ 
 			if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
 				$reason = "The IP <$ip> has been listed because was marked $nlearn times as $category by $nuid different accounts during last ".$cf['oldestday'].' days.';
 				$listed = searchAndList ($myconn,$cf['user'],$tables,$cf['list']["$category"],$ip,$cf['unit']["$category"],$quantity,$reason);
+			} else {
+				$listed = FALSE;
 			}
-			else $listed = FALSE;
+		} else {
+			$listed = FALSE;
 		}
-		else $listed = FALSE;
 		$nowlist = array( TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
@@ -123,7 +139,9 @@ 
 		$return .='<tr><td rowspan="'.$nuid.'">'.$ip.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$ipvet['ip']["$ip"][0],$nlearn,$nowlist["$listed"]['name']);
 		$rowuid=NULL;
-                for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nuid;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
 		array_shift($ipvet['ip']["$ip"]);
                 $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
 
@@ -136,14 +154,18 @@ 
 	$return .= '<h3>Statistics by UID</h3><table><tr><th>UID</th><th>IP learned</th><th>Learned times</th></tr>'."\n";
 	$uids = array_keys($ipvet['uid']);
         foreach ( $uids as $uid ) {
-		if ( $uid == 'count' ) continue;	
+		if ( $uid == 'count' ) {
+			continue;
+		}
 	        $nlearn = $ipvet['uid']["$uid"]['count'];
 	        unset ( $ipvet['uid']["$uid"]['count'] );
 		$nip = count($ipvet['uid']["$uid"]);
 		$return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>';
 		$return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$ipvet['uid']["$uid"][0],$nlearn);
                 $rowuid=NULL;
-                for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+                for ($j=1;$j<$nip;$j++) {
+                	$rowuid .= '<tr><td>%s</td></tr>';
+                }
                 array_shift($ipvet['uid']["$uid"]);
                 $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
 
@@ -192,14 +214,14 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
-	    }
-	    else if ($result instanceof Splunk_ResultsMessage)
+	      if ( count($result->getFieldNames()) > 1 ) {
+	      	return FALSE;
+	      }
+	    } else if ($result instanceof Splunk_ResultsMessage)
 	    {
 	      // I don't want messages in my search
 	      return FALSE;
-	    }
-	    else if (is_array($result))
+	    } else if (is_array($result))
 	    {
 	      // Process a row
 	      foreach ($result as $key => $valueOrValues)
@@ -207,15 +229,13 @@ 
 	         if (is_array($valueOrValues))
 	          {
 	            return FALSE;
-	          }
-	         else
+	          } else
 	          {
 	            return $valueOrValues;
 	            #print "  {$key} => {$value}\r\n";
 	          }
 	        }
-	    }
-	    else
+	    } else
 	    {
 	      #print "Unknow result type";
 	      return FALSE;
@@ -229,7 +249,9 @@ 
 	$fileb= dirname(__FILE__) . '/' . $cf['badreportFile']["$type"];
 	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$cf['folder']["$type"], $cf['account'],$cf['authpassword'], OP_READONLY)
         	or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
-	if ( !$m_mail ) exit(254);
+	if ( !$m_mail ) {
+		exit(254);
+	}
 		
 
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
@@ -242,20 +264,28 @@ 
 	// Order results starting from newest message
 	if ( empty($m_search) ) {
 		syslog (LOG_INFO,$cf['user'].": No mail found in $type folder. No reports written for $type.");
-	        if ( $ierr = imap_errors() )
-	                foreach ( $ierr as $thiserr )
+	        if ( $ierr = imap_errors() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
+	        }
+	        if ( $ierr = imap_alerts() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	        }
 		imap_close( $m_mail );
-		if ( file_exists( $file ) ) unlink ($file);
-		if ( file_exists( $fileb ) ) unlink ($fileb);
+		if ( file_exists( $file ) ) {
+			unlink ($file);
+		}
+		if ( file_exists( $fileb ) ) {
+			unlink ($fileb);
+		}
 		return FALSE;
 	}
 	$nmes = count ($m_search);
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in $type folder.");
-	if ($nmes>0) rsort($m_search);
+	if ($nmes>0) {
+		rsort($m_search);
+	}
 
 	// Create report file
 
@@ -264,7 +294,9 @@ 
 	$lastup = "Last Update: " . date ("d F Y H:i", time());
 	fwrite( $fp, file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
 	fwrite( $fp,"<h1> Report of IP sending $type</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
-	if ($cf['onlyReport']) fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
+	if ($cf['onlyReport']) {
+		fwrite( $fp,'<p>None of the below IP has been listed because listing is not active in configuration.</p>');
+	}
 	fwrite( $fp,'<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>IP</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned IP appears in different mails">#IP</th><th nowrap>Received by</th><th>Message-Id</th></tr>' );
 	fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateHeader']) );
 	fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" );
@@ -310,10 +342,11 @@ 
 
 	                if (in_array($uid,array_keys($ipuid['uid']))) {
 				$ipuid['uid']["$uid"]['count']++;		//number of learn by this uid
-				if (!in_array($ip,$ipuid['uid']["$uid"])) 
-					$ipuid['uid']["$uid"][]=$ip;		//ips learned by this uid
-			}
-			else {
+				if (!in_array($ip,$ipuid['uid']["$uid"])) {
+									$ipuid['uid']["$uid"][]=$ip;
+				}
+				//ips learned by this uid
+			} else {
 				$ipuid['uid']["$uid"]['count'] = 1;
 				$ipuid['uid']["$uid"][]=$ip;
 				$ipuid['uid']['count']++;                	//number of unique uids
@@ -321,10 +354,11 @@ 
 
                         if (in_array($ip,array_keys($ipuid['ip']))) {
                                 $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
-				if (!in_array($uid,$ipuid['ip']["$ip"]))
-					$ipuid['ip']["$ip"][]=$uid;		//uids that learned this ip
-			}
-                        else {
+				if (!in_array($uid,$ipuid['ip']["$ip"])) {
+									$ipuid['ip']["$ip"][]=$uid;
+				}
+				//uids that learned this ip
+			} else {
                                 $ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
@@ -332,21 +366,30 @@ 
 
 	        	/* Update HTML report */
 	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
-		}
-	        else {	/* Bad learn */
+		} else {	/* Bad learn */
 			
-                        if (in_array($uid,array_keys($uidbad['uid']))) 
-                                $uidbad['uid']["$uid"]['count']++;               //number of bad learn by this uid
+                        if (in_array($uid,array_keys($uidbad['uid']))) {
+                                                        $uidbad['uid']["$uid"]['count']++;
+                        }
+                        //number of bad learn by this uid
                         else {
                                 $uidbad['uid']["$uid"]['count'] = 1;
 				$uidbad['uid']["$uid"][]=$uid;
                                 $uidbad['count']++;                       //numeber of unique bad uids
                         }
 			/* The reason of bad report */
-			if ($host === FALSE) $reason = 'This mail was not received by recognized MX host';
-			if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn';
-			if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log';
-			if (!isset($reason)) $reason = '?';
+			if ($host === FALSE) {
+				$reason = 'This mail was not received by recognized MX host';
+			}
+			if ($dateReceived === FALSE) {
+				$reason = 'This mail was not submitted to recognized MSA for learn';
+			}
+			if ($uid=='unknown') {
+				$reason = 'The uid of this mail was not found in splunk log';
+			}
+			if (!isset($reason)) {
+				$reason = '?';
+			}
 				
 			fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) );
 		}
@@ -364,9 +407,9 @@ 
 	fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['thresholdip']["$type"].' times from at least '.$cf['thresholduid']["$type"].' different valid uids.</h5>' );
 
         /* Make MYSQL connection */
-	if ( $cf['onlyReport'] )
-		$mysqli = NULL;
-	else {
+	if ( $cf['onlyReport'] ) {
+			$mysqli = NULL;
+	} else {
         	$mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']);
         	if ($mysqli->connect_error) {
                 	syslog (LOG_EMERG, $cf['user'].': Connect Error (' . $mysqli->connect_errno . ') '
@@ -378,8 +421,9 @@ 
 	/***********************/
 
 	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid) );
-	if ( !$cf['onlyReport'] )
-		$mysqli->close();
+	if ( !$cf['onlyReport'] ) {
+			$mysqli->close();
+	}
 	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
 	fclose($fp);
 
@@ -389,12 +433,14 @@ 
 	fclose($fpb);
 	syslog (LOG_INFO,$cf['user'].': Report files written. Listing job for '.$type.' terminated.');
 
-	if ( $ierr = imap_errors() )
-		foreach ( $ierr as $thiserr )
+	if ( $ierr = imap_errors() ) {
+			foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
+	}
+	if ( $ierr = imap_alerts() ) {
+	                foreach ( $ierr as $thiserr )
                         syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	}
 	imap_close($m_mail);
 }
 ?>

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

result.php

Braces +28 added lines, -16 removed lines

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

list.php

Braces +13 added lines, -6 removed lines

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

function.php

Braces +128 added lines, -84 removed lines

@@ -3,9 +3,13 @@ 
 ini_set('error_log', 'syslog');
 
 function username() {
-	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+	if (isset ($_SERVER['REMOTE_USER'])) {
+		$user = $_SERVER['REMOTE_USER'];
+	} else if (isset ($_SERVER['USER'])) {
+        		$user = $_SERVER['USER'];
+        	} else {
+                		$user='unknown';
+                	}
 	return $user;
 }
 
@@ -89,8 +93,9 @@ 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
 	    $result=TRUE;
+	} else {
+		syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	}
-	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
@@ -131,8 +136,9 @@ 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
 		$result=TRUE;
+        } else {
+        	syslog (LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
 	return $result;
 }
 
@@ -155,9 +161,11 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
-            syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        if ($return=$myconn->query($query) === TRUE) {
+                    syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        }
 
         return $return;
 }
@@ -179,8 +187,9 @@ 
 
         if ($return=$myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: change status of $type <$value>. The status is now <$status>");
+        } else {
+        	syslog(LOG_ERR, "$user: Error: ". $myconn->error);
         }
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
 	return $return;	
 }
 
@@ -204,14 +213,16 @@ 
 				$j++;
 
 			} while ($myconn->next_result());
-		}
-		else {
+		} else {
 			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
 			$return = FALSE;
 		}
 	}
-	if ( !($return) ) syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
-	else  syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	if ( !($return) ) {
+		syslog(LOG_EMERG, 'End of Expire job with error. See above logs. SQL Connection terminated');
+	} else {
+		syslog(LOG_INFO, 'Successfully End of Expire job. SQL Connection successfully terminated.');
+	}
         return $return;
 }
 
@@ -220,8 +231,11 @@ 
 
 	$exp=new DateTime($row['exp']);
 	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
-	else return false;
+	if (($exp > $now) and ($row['active'])) {
+		return true;
+	} else {
+		return false;
+	}
 
 }
 
@@ -241,10 +255,11 @@ 
 END;
 		$activeMilts = explode(',',$value);
 		foreach ( $milts as $milter ) {
-			if ( in_array($milter, $activeMilts) )
-				$selected= 'selected';
-			else
-				$selected= NULL;
+			if ( in_array($milter, $activeMilts) ) {
+							$selected= 'selected';
+			} else {
+							$selected= NULL;
+			}
 			$button .= sprintf('<option value="%s" %s>%s</option>', $milter, $selected, $milter);
 		}	
 		$button .= '</select></div><input class="button" name="Change" type="submit" value="Change" /></form>';
@@ -261,9 +276,12 @@ 
 	$whynot=NULL;
 	switch ($what) {
 		case 'Ok':
-			if ($lock) return NULL;
-			if (in_array($user,array_keys($adm)))
-				if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			if ($lock) {
+				return NULL;
+			}
+			if (in_array($user,array_keys($adm))) {
+							if ( consistentListing($myconn,$alltables,$typedesc,$value,$whynot) ) return require('relistButton.php');
+			}
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -275,7 +293,9 @@ 
 function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
-	if (! isset($alltables["$typed"]['depend']) ) return TRUE;
+	if (! isset($alltables["$typed"]['depend']) ) {
+		return TRUE;
+	}
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
 		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
@@ -306,10 +326,10 @@ 
 	
 	if ( $tablelist['milter'] ) {
 		$table = milterTable($type);
-		if ($value == 'ALL')
-			$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
+		if ($value == 'ALL') {
+					$query = sprintf('SELECT *, GROUP_CONCAT(milt.name) as miltnames FROM `%s` LEFT JOIN milt ON (%s.idmilt=milt.id) GROUP by idmilt',
 				$table,$table);
-		else {
+		} else {
 			switch ($type) {
 				case 'network':
 					list($sub['net'],$sub['mask'])=explode('/',$value);
@@ -334,12 +354,11 @@ 
 					return FALSE;
 			}
 		}
-	}
-
-	else {
+	} else {
 	        $table = $tablelist['name'];
-	        if ($value == 'ALL') $query = 'select * from '.$table;
-	        else {
+	        if ($value == 'ALL') {
+	        	$query = 'select * from '.$table;
+	        } else {
 	                switch ($type) {
 	                  case 'ip':
 	                        $query= "select * from $table where $type =  INET_ATON('$value')";
@@ -361,8 +380,9 @@ 
 	}
 
 	$result = $myconn->query($query);
-	if($result === false)
-		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	if($result === false) {
+			syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
+	}
         return $result;
 }
 
@@ -379,12 +399,14 @@ 
 
 function isFull($myconn,$typedesc,$alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-		if ( $alltables["$typedesc"]['milter'] )
-			$tab = 'net';
-		else
-			$tab = $alltables["$typedesc"]['name'];
-                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
+		if ( $alltables["$typedesc"]['milter'] ) {
+					$tab = 'net';
+		} else {
+					$tab = $alltables["$typedesc"]['name'];
+		}
+                if ( countListed($myconn,$tab) >= $alltables["$typedesc"]['limit'] ) {
+                                        return TRUE;
+                }
         }
 	return FALSE;
 }
@@ -397,8 +419,9 @@ 
 	$tabhtm = <<<END
 	<table><thead><tr><th>$type</th><th title="The date this object has been listed for the first time">DateAdd</th><th>DateMod</th><th>Exp</th><th>Status</th><th title="Number of times this object has been listed">#List</th>
 END;
-	if ( $tables["$typedesc"]['milter'] )
-		$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	if ( $tables["$typedesc"]['milter'] ) {
+			$tabhtm .= '<th title="Milter active for this object">Milters</th>';
+	}
 	$tabhtm .= '<th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 
 	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
@@ -407,18 +430,23 @@ 
 
         /* Check for limit in number of listed items */
 	$full = isFull($myconn,$typedesc,$tables);
-	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	if ($full) {
+		print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
+	}
 
 		if ($result->num_rows) {
 			print $tabhtm;
 			$i=0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
-				}	
-				else
-					$listed='Ok';
+					if ($tables["$typedesc"]['bl']) {
+						$listed='Listed';
+					} else {
+						$listed='WhiteListed';
+					}
+				} else {
+									$listed='Ok';
+				}
 
 				switch ($type) {
 				  case 'ip':
@@ -431,27 +459,30 @@ 
 					$element = $riga["$type"];
 				}
 
-				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) )
-					printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				if ( $tables["$typedesc"]['milter'] AND checkMilterConf($tables["$typedesc"]) ) {
+									printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td nowrap id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], askMilter($myconn,$i,$element,$typedesc,$riga['idmilt'],$riga['miltnames'],$user,$adm), $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
-				else
-					 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
+				} else {
+									 printf ("<tr id=id$i><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td id='status$listed'>%s</td><td>%s</td></tr>\n",
 					$element, $riga['date'], $riga['datemod'], $riga['exp'], $riga['active'], $riga['nlist'], $riga['user'],htmlspecialchars($riga['reason']),ask($myconn,$i,$listed,$tables,$typedesc,$element,$full,$user,$adm));
+				}
 				$i++;
         		}
 			print '</tbody></table>';
-		}
-		else {
+		} else {
 			print "<pre>$type &lt;$value&gt; is not listed!\n</pre>";
-			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') )
-				if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
-									else print '<p>'.htmlspecialchars($whynot).'</p>';
+			if ( in_array($user,array_keys($adm)) AND ($value != 'ALL') ) {
+							if ( (!$full) AND (consistentListing($myconn,$tables,$typedesc,$value,$whynot)) ) require_once('listForm.php');
+			} else {
+										print '<p>'.htmlspecialchars($whynot).'</p>';
+									}
 				
 		}
 		$result->free();
+	} else {
+		print '<pre>Query error or something wrong in DB schema'."\n</pre>";
+	}
 	}
-	else print '<pre>Query error or something wrong in DB schema'."\n</pre>";
-}
 
 
 
@@ -494,24 +525,32 @@ 
                 $old_mailfrom = ini_get("sendmail_from");
                 ini_set("sendmail_from", $from);
                 $params = sprintf("-oi -f %s", '<>');
-                if (!(mail($to,$sbj, $body,$headers,$params))) $flag=FALSE;
-                else $flag=TRUE;
-                if (isset($old_mailfrom))
-                        ini_set("sendmail_from", $old_mailfrom);
-        }
-        else {
-                if (!(mail($to,$sbj, $body,$headers))) $flag=FALSE;
-                else $flag=TRUE;
+                if (!(mail($to,$sbj, $body,$headers,$params))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
+                if (isset($old_mailfrom)) {
+                                        ini_set("sendmail_from", $old_mailfrom);
+                }
+        } else {
+                if (!(mail($to,$sbj, $body,$headers))) {
+                	$flag=FALSE;
+                } else {
+                	$flag=TRUE;
+                }
         }
         return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
-		return $ini_array["$dom"];
-	else return FALSE;
-}
+	if (in_array($dom,array_keys($ini_array))) {
+			return $ini_array["$dom"];
+	} else {
+		return FALSE;
+	}
+	}
 
 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
@@ -588,9 +627,10 @@ 
 	$net = new \dautkom\ipv4\IPv4();
 	$range = $net->address($addressA)->mask($maskA)->getRange();
 	$ips = ipRange($range);
-	foreach ( $ips as $ip )
-		if ( $net->address($addressB)->mask($maskB)->has($ip) )
+	foreach ( $ips as $ip ) {
+			if ( $net->address($addressB)->mask($maskB)->has($ip) )
 			return TRUE;
+	}
 	return FALSE;
 }
 
@@ -667,8 +707,9 @@ 
 		return FALSE;
 	}
 	if ($result->num_rows) {
-		while ($milt = $result->fetch_array(MYSQLI_ASSOC))
-			$milters[] = $milt['name'];
+		while ($milt = $result->fetch_array(MYSQLI_ASSOC)) {
+					$milters[] = $milt['name'];
+		}
 	}
 	$result->free();
 	return $milters;
@@ -694,12 +735,14 @@ 
 				$query[] = "DELETE FROM  `milt` WHERE (`id` = '$miltID' AND `name` = '$value')";
 		}
 	}
-	if ( count($query) ) /* This "if" is redundant, because if I call this I already checked there is a change */
+	if ( count($query) ) {
+		/* This "if" is redundant, because if I call this I already checked there is a change */
 		/* I update datemod because the user couldn't change */
 		$query[] = sprintf('UPDATE `%s` SET
 						`user`=\'%s\',
 						`datemod`= CURRENT_TIMESTAMP
 					 WHERE `idmilt`=%d', $table, $loguser, $miltID);
+	}
 
 
 	/* Start a safe transaction: it commits only if all queries happen */
@@ -713,19 +756,20 @@ 
 		}
 	}
 	if ( $ok ) {
-		if ( $myconn->commit() )
-			syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
-		else {
+		if ( $myconn->commit() ) {
+					syslog(LOG_INFO, "$loguser: Milter setting changed successfully.");
+		} else {
 			syslog(LOG_ERR, "$loguser: Milter setting NOT changed for an unpredictable COMMIT error.");
-			if ( $myconn->rollback() )
-				syslog(LOG_INFO, "$loguser: rollback succeeded.");
-			else
-				syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			if ( $myconn->rollback() ) {
+							syslog(LOG_INFO, "$loguser: rollback succeeded.");
+			} else {
+							syslog(LOG_ERR, "$loguser: rollback failed. Your db could be compromized. Check it!");
+			}
 			$ok = FALSE;
 		}
+	} else {
+			syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	}
-	else
-		syslog(LOG_ERR, "$loguser: Error: Milter setting NOT changed. See at above errors.");
 	return $ok;
 		
 }

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