falon / RBL

contrib/ipImap/function.php

Indentation +121 added lines, -121 removed lines

@@ -12,14 +12,14 @@ 
 #			print "Examine ".$received[0][$i]."\n";
 			if ( preg_match($msa,$received['host'][$i]) )
 				$dateR = $received['date'][$i];
-        		foreach ($mxserver as $mx) {
-        			if (!$ip)
+				foreach ($mxserver as $mx) {
+					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';
@@ -39,15 +39,15 @@ 
 
 
 function summaryBadReport ($uidvet) {
-        $nuid = $uidvet['count'];
-        if ( empty($uidvet) ) return NULL;
-        $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n";
+		$nuid = $uidvet['count'];
+		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 */
-        $uids = array_keys($uidvet['uid']);
+		/* Remove count index */
+		$uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
+		foreach ( $uids as $uid ) {
 		$totlearn += $uidvet['uid']["$uid"]['count'];; 
 		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
 	}
@@ -60,26 +60,26 @@ 
 
 function array_msort($array, $cols)
 {
-    $colarr = array();
-    foreach ($cols as $col => $order) {
-        $colarr[$col] = array();
-        foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
-    }
-    $eval = 'array_multisort(';
-    foreach ($cols as $col => $order) {
-        $eval .= '$colarr[\''.$col.'\'],'.$order.',';
-    }
-    $eval = substr($eval,0,-1).');';
-    eval($eval);
-    $ret = array();
-    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];
-        }
-    }
-    return $ret;
+	$colarr = array();
+	foreach ($cols as $col => $order) {
+		$colarr[$col] = array();
+		foreach ($array as $k => $row) { $colarr[$col]['_'.$k] = strtolower($row[$col]); }
+	}
+	$eval = 'array_multisort(';
+	foreach ($cols as $col => $order) {
+		$eval .= '$colarr[\''.$col.'\'],'.$order.',';
+	}
+	$eval = substr($eval,0,-1).');';
+	eval($eval);
+	$ret = array();
+	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];
+		}
+	}
+	return $ret;
 
 }
 
@@ -94,8 +94,8 @@ 
 
 	foreach ( $ips as $ip ) {
 		if ( $ip == 'count' ) continue;
-                $nlearn = $ipvet['ip']["$ip"]['count'];
-                unset($ipvet['ip']["$ip"]['count']);
+				$nlearn = $ipvet['ip']["$ip"]['count'];
+				unset($ipvet['ip']["$ip"]['count']);
 		$nuid = count($ipvet['ip']["$ip"]);
 		if ( !$cf['onlyReport'] ) {
 			if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
@@ -122,9 +122,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"]);
+				$return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
 
 	}
 	$return .= sprintf ('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$ipvet['ip']['count'],$ipvet['uid']['count'],$nips);
@@ -134,20 +134,20 @@ 
 	/* Not used for listing purpose, but useful to you! */
 	$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 ) {
+		foreach ( $uids as $uid ) {
 		if ( $uid == 'count' ) continue;	
-	        $nlearn = $ipvet['uid']["$uid"]['count'];
-	        unset ( $ipvet['uid']["$uid"]['count'] );
+			$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>';
-                array_shift($ipvet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
+				$rowuid=NULL;
+				for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>';
+				array_shift($ipvet['uid']["$uid"]);
+				$return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
 
-        }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
+		}
+		$return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
 
 
 	return $return;
@@ -164,9 +164,9 @@ 
 	// A blocking search returns the job when the search is done
 	/* Wait to finish */
 	$job = $service->getJobs()->create($searchQueryBlocking, array(
-	    'exec_mode' => 'blocking',
-	    'earliest_time' => date("c",strtotime ($date)-120),
-	    'latest_time' => date("c",strtotime ($date)+60)
+		'exec_mode' => 'blocking',
+		'earliest_time' => date("c",strtotime ($date)-120),
+		'latest_time' => date("c",strtotime ($date)+60)
 	));
 
 
@@ -179,38 +179,38 @@ 
 	// Use the built-in XML parser to display the job results
 	foreach ($resultSearch as $result)
 	  {
-	    if ($result instanceof Splunk_ResultsFieldOrder)
-	    {
-	      // 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)
-	    {
-	      // I don't want messages in my search
-	      return FALSE;
-	    }
-	    else if (is_array($result))
-	    {
-	      // Process a row
-	      foreach ($result as $key => $valueOrValues)
-	        {
-	         if (is_array($valueOrValues))
-	          {
-	            return FALSE;
-	          }
-	         else
-	          {
-	            return $valueOrValues;
-	            #print "  {$key} => {$value}\r\n";
-	          }
-	        }
-	    }
-	    else
-	    {
-	      #print "Unknow result type";
-	      return FALSE;
-	    }
+		if ($result instanceof Splunk_ResultsFieldOrder)
+		{
+		  // 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)
+		{
+		  // I don't want messages in my search
+		  return FALSE;
+		}
+		else if (is_array($result))
+		{
+		  // Process a row
+		  foreach ($result as $key => $valueOrValues)
+			{
+			 if (is_array($valueOrValues))
+			  {
+				return FALSE;
+			  }
+			 else
+			  {
+				return $valueOrValues;
+				#print "  {$key} => {$value}\r\n";
+			  }
+			}
+		}
+		else
+		{
+		  #print "Unknow result type";
+		  return FALSE;
+		}
 	  }
 }
 
@@ -219,26 +219,26 @@ 
 	$file = dirname(__FILE__) . '/' . $cf['reportFile']["$type"];
 	$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());
+			or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
 	if ( !$m_mail ) exit(254);
 		
 
 	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
 	//get all messages
 	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+		$dateN  = date ( "d-M-Y", strToTime ( "now" ) );
+		$m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
 
 
 	// 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 )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
-	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $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 )
+							syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 		imap_close( $m_mail );
 		if ( file_exists( $file ) ) unlink ($file);
 		if ( file_exists( $fileb ) ) unlink ($fileb);
@@ -271,16 +271,16 @@ 
 	$uidbad['count'] = 0;
 	$uidbad['uid'] = array();
 
-        // loop for each message
+		// loop for each message
 	foreach ($m_search as $onem) {
 
-	        //get imap header info for obj thang
-	        //$headers = imap_headerinfo($m_mail, $onem);
-	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
+			//get imap header info for obj thang
+			//$headers = imap_headerinfo($m_mail, $onem);
+			//$head = imap_fetchheader($m_mail, $headers->Msgno);
 		$head = imap_fetchheader($m_mail, $onem );
-	        //$obj = imap_rfc822_parse_headers( $head);
+			//$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
+			list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
 		if (empty($mid)) {
 			$uid='NA';
 			syslog (LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
@@ -295,11 +295,11 @@ 
 				}
 		}
 
-	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			/* Update count of each ip */
+			if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
 			$ipuid['count']++;					//number of right messages
 
-	                if (in_array($uid,array_keys($ipuid['uid']))) {
+					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
@@ -310,29 +310,29 @@ 
 				$ipuid['uid']['count']++;                	//number of unique uids
 			}
 
-                        if (in_array($ip,array_keys($ipuid['ip']))) {
-                                $ipuid['ip']["$ip"]['count']++;			//number of time this ip appears in different messages
+						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 {
-                                $ipuid['ip']["$ip"]['count'] = 1;
+						else {
+								$ipuid['ip']["$ip"]['count'] = 1;
 				$ipuid['ip']["$ip"][]=$uid;
 				$ipuid['ip']['count']++;			//number of unique ips
-                        }
+						}
 
-	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+				/* 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
-                        else {
-                                $uidbad['uid']["$uid"]['count'] = 1;
+						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
-                        }
+								$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';
@@ -354,17 +354,17 @@ 
 	fwrite($fp, '</table>');
 	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 */
+		/* Make MYSQL connection */
 	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 . ') '
-                	. $mysqli->connect_error);
-                	exit (254);
-        	}
-        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+			$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 . ') '
+					. $mysqli->connect_error);
+					exit (254);
+			}
+			syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
 	}
 	/***********************/
 
@@ -384,8 +384,8 @@ 
 		foreach ( $ierr as $thiserr )
 			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
 	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
-                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+				foreach ( $ierr as $thiserr )
+						syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

Spacing +132 added lines, -132 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-function getIP($header,$mxserver,$msa) {
+function getIP($header, $mxserver, $msa) {
 /* Get submission server's IP from header's mail */
 /* Each line must end with /r/n			 */
 /* IP is the first one written by your mxserver	 */
@@ -7,10 +7,10 @@ 
 	$ip = FALSE;
 	$host = FALSE;
 	$dateR = FALSE;
-	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--) {
+	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]) )
+			if (preg_match($msa, $received['host'][$i]))
 				$dateR = $received['date'][$i];
         		foreach ($mxserver as $mx) {
         			if (!$ip)
@@ -21,38 +21,38 @@ 
                 	}
         	}
 	}
-	if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1)
+	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)
+	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']);
+	return array($ip, $host, $dateR, $dateC['date'], $mid['mid']);
 }
 
-function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) {
+function updateReport($ip, $uid, $ipcount, $uidcount, $hostname, $dateC, $msgid, $dateL) {
 
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) );
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n", $dateL, $dateC, $uid, $ip, $uidcount, $ipcount, $hostname, htmlentities($msgid));
 }
 
-function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) {
-	return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text );
+function updatebadReport($uid, $dateC, $msgid, $dateL, $text) {
+	return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n", $dateL, $dateC, $uid, htmlentities($msgid), $text);
 }
 
 
-function summaryBadReport ($uidvet) {
+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 */
         $uids = array_keys($uidvet['uid']);
 	$totlearn = 0;
 
-        foreach ( $uids as $uid ) {
-		$totlearn += $uidvet['uid']["$uid"]['count'];; 
-		$return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']);
+        foreach ($uids as $uid) {
+		$totlearn += $uidvet['uid']["$uid"]['count']; ; 
+		$return .= sprintf('<tr><td>%s</td><td>%u</td></tr>', $uid, $uidvet['uid']["$uid"]['count']);
 	}
-	$return .= sprintf ('<tr><th>%s</th><th>%u</th></tr></table>','TOT',$totlearn);
-	$return .= sprintf ('<p>%s : %u</p>','Unique UID',$nuid);
+	$return .= sprintf('<tr><th>%s</th><th>%u</th></tr></table>', 'TOT', $totlearn);
+	$return .= sprintf('<p>%s : %u</p>', 'Unique UID', $nuid);
 
 	return $return;
 }
@@ -69,12 +69,12 @@ 
     foreach ($cols as $col => $order) {
         $eval .= '$colarr[\''.$col.'\'],'.$order.',';
     }
-    $eval = substr($eval,0,-1).');';
+    $eval = substr($eval, 0, -1).');';
     eval($eval);
     $ret = array();
     foreach ($colarr as $col => $arr) {
         foreach ($arr as $k => $v) {
-            $k = substr($k,1);
+            $k = substr($k, 1);
             if (!isset($ret[$k])) $ret[$k] = $array[$k];
             if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col];
         }
@@ -84,28 +84,28 @@ 
 }
 
 
-function summaryReportAndList ($cf,$myconn,$tables,$category,$ipvet) {
+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;
+	foreach ($ips as $ip) {
+		if ($ip == 'count') continue;
                 $nlearn = $ipvet['ip']["$ip"]['count'];
                 unset($ipvet['ip']["$ip"]['count']);
 		$nuid = count($ipvet['ip']["$ip"]);
-		if ( !$cf['onlyReport'] ) {
-			if ( ($nlearn >= $cf['thresholdip']["$category"])&&($nuid >= $cf['thresholduid']["$category"]) ) {
+		if (!$cf['onlyReport']) {
+			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"],$cf['quantity']["$category"],$reason);
+				$listed = searchAndList($myconn, $cf['user'], $tables, $cf['list']["$category"], $ip, $cf['unit']["$category"], $cf['quantity']["$category"], $reason);
 			}
 			else $listed = FALSE;
 		}
 		else $listed = FALSE;
-		$nowlist = array( TRUE =>  array(
+		$nowlist = array(TRUE =>  array(
 					'style' => 'id=\'ipfound\'',
 					'name'  => 'YES',
 				  ),
@@ -119,45 +119,45 @@ 
 				  )
 		);
 		
-		$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>';
+		$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>';
 		array_shift($ipvet['ip']["$ip"]);
-                $return .= vsprintf ($rowuid,$ipvet['ip']["$ip"]);
+                $return .= vsprintf($rowuid, $ipvet['ip']["$ip"]);
 
 	}
-	$return .= sprintf ('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$ipvet['ip']['count'],$ipvet['uid']['count'],$nips);
+	$return .= sprintf('<tr><th title="unique ips">%u</th><th title="unique uids">%u</th><th>%u</th></table>', $ipvet['ip']['count'], $ipvet['uid']['count'], $nips);
 
 
 	/* Statistics by UID */
 	/* Not used for listing purpose, but useful to you! */
 	$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;	
+        foreach ($uids as $uid) {
+		if ($uid == 'count') continue;	
 	        $nlearn = $ipvet['uid']["$uid"]['count'];
-	        unset ( $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>';
+		$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>';
                 array_shift($ipvet['uid']["$uid"]);
-                $return .= vsprintf ($rowuid,$ipvet['uid']["$uid"]);
+                $return .= vsprintf($rowuid, $ipvet['uid']["$uid"]);
 
         }
-        $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>',$ipvet['uid']['count'],$ipvet['ip']['count'],$nips);	
+        $return .= sprintf('<tr><th title="unique uids">%u</th><th title="unique ips">%u</th><th>%u</th></table>', $ipvet['uid']['count'], $ipvet['ip']['count'], $nips);	
 
 
 	return $return;
 }
 
 
-function splunksearch ($service,$message_id,$date) {
+function splunksearch($service, $message_id, $date) {
 
 	// Run a blocking search
-	$searchQueryBlocking = 'search (message_id="'. addslashes( $message_id ) .
+	$searchQueryBlocking = 'search (message_id="'.addslashes($message_id).
 				'" OR sasl_username) | transaction message_id queue_id maxspan=3m maxpause=2m | search sasl_username message_id=* | table sasl_username';
 
 
@@ -165,8 +165,8 @@ 
 	/* Wait to finish */
 	$job = $service->getJobs()->create($searchQueryBlocking, array(
 	    'exec_mode' => 'blocking',
-	    'earliest_time' => date("c",strtotime ($date)-120),
-	    'latest_time' => date("c",strtotime ($date)+60)
+	    'earliest_time' => date("c", strtotime($date)-120),
+	    'latest_time' => date("c", strtotime($date)+60)
 	));
 
 
@@ -183,7 +183,7 @@ 
 	    {
 	      // More than one field attribute returned by search
 	      // You must redefine the search
-	      if ( count($result->getFieldNames()) > 1 ) return FALSE;
+	      if (count($result->getFieldNames())>1) return FALSE;
 	    }
 	    else if ($result instanceof Splunk_ResultsMessage)
 	    {
@@ -215,51 +215,51 @@ 
 }
 
 
-function imapReport ($cf,$myconnArray,$splunkconn,$tables,$type) {
-	$file = dirname(__FILE__) . '/' . $cf['reportFile']["$type"];
-	$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);
+function imapReport($cf, $myconnArray, $splunkconn, $tables, $type) {
+	$file = dirname(__FILE__).'/'.$cf['reportFile']["$type"];
+	$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);
 		
 
-	syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
+	syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading $type messages of last ".$cf['oldestday'].' days...');
 	//get all messages
-	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-        $dateN  = date ( "d-M-Y", strToTime ( "now" ) );
-        $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" );
+	$dateTh = date("d-M-Y", strToTime('-'.$cf['oldestday'].' days'));
+        $dateN = date("d-M-Y", strToTime("now"));
+        $m_search = imap_search($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"");
 
 
 	// 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 )
-	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $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 (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)
+	                        syslog(LOG_ERR, $cf['user'].": IMAP Error: $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);
 		return FALSE;
 	}
-	$nmes = count ($m_search);
-	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in $type folder.");
+	$nmes = count($m_search);
+	syslog(LOG_INFO, $cf['user'].": Found $nmes mail in $type folder.");
 	if ($nmes>0) rsort($m_search);
 
 	// Create report file
 
 	$fp = fopen($file, 'w');
-	$fpb= fopen($fileb, 'w');
-	$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>');
-	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>" );
-	fwrite( $fpb,'<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>' );
+	$fpb = fopen($fileb, 'w');
+	$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>');
+	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>");
+	fwrite($fpb, '<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>');
 
 	$ipuid = array();
 	$ipuid['count'] = 0;
@@ -277,69 +277,69 @@ 
 	        //get imap header info for obj thang
 	        //$headers = imap_headerinfo($m_mail, $onem);
 	        //$head = imap_fetchheader($m_mail, $headers->Msgno);
-		$head = imap_fetchheader($m_mail, $onem );
+		$head = imap_fetchheader($m_mail, $onem);
 	        //$obj = imap_rfc822_parse_headers( $head);
 
-	        list ($ip,$host,$dateReceived,$dateClient,$mid) =  getIP( $head,$cf['mx'],$cf['msalearn'] );
+	        list ($ip, $host, $dateReceived, $dateClient, $mid) = getIP($head, $cf['mx'], $cf['msalearn']);
 		if (empty($mid)) {
-			$uid='NA';
-			syslog (LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
-		} else {
+			$uid = 'NA';
+			syslog(LOG_ERR, $cf['user'].": Error retrieving data for empty Message-ID.");
+		}else {
 			if ($dateReceived === FALSE) {
-				$uid='unauthenticated';
-				syslog (LOG_ERR, $cf['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
-			} else  
-				if ( !($uid = splunksearch ($splunkconn, trim($mid,'<>'), $dateReceived)) ) {
-					syslog (LOG_ERR, $cf['user'].": Error retrieving uid from Splunk log for $mid.");
-					$uid='unknown';
+				$uid = 'unauthenticated';
+				syslog(LOG_ERR, $cf['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA");
+			}else  
+				if (!($uid = splunksearch($splunkconn, trim($mid, '<>'), $dateReceived))) {
+					syslog(LOG_ERR, $cf['user'].": Error retrieving uid from Splunk log for $mid.");
+					$uid = 'unknown';
 				}
 		}
 
 	        /* Update count of each ip */
-	        if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers  and learned by valid uid */
-			$ipuid['count']++;					//number of right messages
+	        if ($host and ($uid != 'NA') and ($uid != 'unauthenticated') and ($uid != 'unknown')) { /* IP is received by MX servers  and learned by valid uid */
+			$ipuid['count']++; //number of right messages
 
-	                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
+	                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 {
 				$ipuid['uid']["$uid"]['count'] = 1;
-				$ipuid['uid']["$uid"][]=$ip;
-				$ipuid['uid']['count']++;                	//number of unique uids
+				$ipuid['uid']["$uid"][] = $ip;
+				$ipuid['uid']['count']++; //number of unique uids
 			}
 
-                        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
+                        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 {
                                 $ipuid['ip']["$ip"]['count'] = 1;
-				$ipuid['ip']["$ip"][]=$uid;
-				$ipuid['ip']['count']++;			//number of unique ips
+				$ipuid['ip']["$ip"][] = $uid;
+				$ipuid['ip']['count']++; //number of unique ips
                         }
 
 	        	/* Update HTML report */
-	        	fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) );
+	        	fwrite($fp, updateReport($ip, $uid, $ipuid['ip']["$ip"]['count'], $ipuid['uid']["$uid"]['count'], $host, $dateClient, $mid, $dateReceived));
 		}
 	        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
+				$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 ($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 ) );
+			fwrite($fpb, updatebadReport($uid, $dateClient, $mid, $dateReceived, $reason));
 		}
 	}
 
@@ -347,45 +347,45 @@ 
 	//close report file and mailbox
 
 	/* Summary Report */
-	$ipuid['ip'] = array_msort( $ipuid['ip'], array('count'=>SORT_DESC) );
-	$ipuid['uid'] = array_msort( $ipuid['uid'], array('count'=>SORT_DESC) );
-	$uidbad['uid'] = array_msort( $uidbad['uid'], array('count'=>SORT_DESC) );
+	$ipuid['ip'] = array_msort($ipuid['ip'], array('count'=>SORT_DESC));
+	$ipuid['uid'] = array_msort($ipuid['uid'], array('count'=>SORT_DESC));
+	$uidbad['uid'] = array_msort($uidbad['uid'], array('count'=>SORT_DESC));
 	
 	fwrite($fp, '</table>');
-	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>' );
+	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'] )
+	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 . ') '
+                	syslog(LOG_EMERG, $cf['user'].': Connect Error ('.$mysqli->connect_errno.') '
                 	. $mysqli->connect_error);
                 	exit (254);
         	}
-        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to ' . $mysqli->host_info) ;
+        	syslog(LOG_INFO, $cf['user'].': Successfully mysql connected to '.$mysqli->host_info);
 	}
 	/***********************/
 
-	fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid) );
-	if ( !$cf['onlyReport'] )
+	fwrite($fp, summaryReportAndList($cf, $mysqli, $tables, $type, $ipuid));
+	if (!$cf['onlyReport'])
 		$mysqli->close();
-	fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
+	fwrite($fp, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateFooter']));
 	fclose($fp);
 
 	fwrite($fpb, '</table>');
-	fwrite( $fpb,summaryBadReport( $uidbad ) );
-	fwrite($fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['reportTemplateFooter']));
+	fwrite($fpb, summaryBadReport($uidbad));
+	fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['reportTemplateFooter']));
 	fclose($fpb);
-	syslog (LOG_INFO,$cf['user'].': Report files written. Listing job for '.$type.' terminated.');
-
-	if ( $ierr = imap_errors() )
-		foreach ( $ierr as $thiserr )
-			syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	if ( $ierr = imap_alerts() )
-                foreach ( $ierr as $thiserr )
-                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	syslog(LOG_INFO, $cf['user'].': Report files written. Listing job for '.$type.' terminated.');
+
+	if ($ierr = imap_errors())
+		foreach ($ierr as $thiserr)
+			syslog(LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
+	if ($ierr = imap_alerts())
+                foreach ($ierr as $thiserr)
+                        syslog(LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
 	imap_close($m_mail);
 }
 ?>

function.php

Indentation +136 added lines, -136 removed lines

@@ -4,8 +4,8 @@ 
 
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
-        	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+			else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
+					else $user='unknown';
 	return $user;
 }
 
@@ -35,7 +35,7 @@ 
 
 	  case 'network':
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -48,10 +48,10 @@ 
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
                 )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
-                break;
+				break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+				$query= sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -66,8 +66,8 @@ 
 	}
 
 	if ($myconn->query($query) === TRUE) {
-	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+		syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
+		$result=TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
@@ -77,9 +77,9 @@ 
 
 	$result=FALSE;
 
-        switch ($type) {
+		switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -87,9 +87,9 @@ 
 			`reason` = '%s'
 			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
 		break;
-          case 'network':
+		  case 'network':
 		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -98,7 +98,7 @@ 
                         WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+				$query= sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
@@ -107,18 +107,18 @@ 
 			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
 	}
 
-        if ($myconn->query($query) === TRUE) {
-            syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
+		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;
 }
 
 function remove ($myconn,$user,$value,$type,$table) {
 
-        switch ($type) {
-          case 'ip':
+		switch ($type) {
+		  case 'ip':
 		$query = sprintf("DELETE FROM `$table` WHERE
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
@@ -134,18 +134,18 @@ 
 	}
 
 
-        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;
+		return $return;
 }
 
 
 function changestatus ($myconn,$user,$value,$status,$type,$table) {
 
 	switch ($type) {
-          case 'ip':
+		  case 'ip':
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
 		break;
 	  case 'network':
@@ -156,16 +156,16 @@ 
 		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
 	}
 
-        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);
+		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);
 	return $return;	
 }
 
 
 function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
+		$return=TRUE;
 	$log=array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
@@ -175,11 +175,11 @@ 
 		/* END OF QUERY */
 		$log[0] = 'expired for';
 		$log[1] = 'disabled for';
-        	if ($myconn->multi_query($query)) {
+			if ($myconn->multi_query($query)) {
 			$j = 0;
 			do {
-		    		$numdel = $myconn->affected_rows;
-	            		syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
+					$numdel = $myconn->affected_rows;
+						syslog(LOG_INFO, "Expire job - <$user> Permanently DELETED $numdel records ".$log[$j]." $expireTime YEARS from <".$tables["$tdesc"]['name'].'>.');
 				$j++;
 
 			} while ($myconn->next_result());
@@ -191,7 +191,7 @@ 
 	}
 	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;
+		return $return;
 }
 
 
@@ -233,7 +233,7 @@ 
 		if ( $entry->num_rows ) {
 			if ( $entry->num_rows == 1 ) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
-                        	if (isListed($riga)) {
+							if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
 					$entry->free();
 					return FALSE;
@@ -250,28 +250,28 @@ 
 function searchentry ($myconn,$value,$tablelist) {
 /* Make a MYSQL query and return result */
 
-        $type = $tablelist['field'];
-        $table = $tablelist['name'];
-
-        if ($value == 'ALL') $query = 'select * from '.$table;
-        else {
-                switch ($type) {
-                  case 'ip':
-                        $query= "select * from $table where $type =  INET_ATON('$value')";
-                        break;
-                  case 'network':
-                        list($sub['net'],$sub['mask'])=explode('/',$value);
-                        $query= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
-                        break;
-                  default:
-                        $query= "select * from $table where $type = '$value'";
-                }
-        }
+		$type = $tablelist['field'];
+		$table = $tablelist['name'];
+
+		if ($value == 'ALL') $query = 'select * from '.$table;
+		else {
+				switch ($type) {
+				  case 'ip':
+						$query= "select * from $table where $type =  INET_ATON('$value')";
+						break;
+				  case 'network':
+						list($sub['net'],$sub['mask'])=explode('/',$value);
+						$query= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
+						break;
+				  default:
+						$query= "select * from $table where $type = '$value'";
+				}
+		}
 
 	$result = $myconn->query($query);
 	if($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
-        return $result;
+		return $result;
 }
 
 function countListed ($myconn,$table) {
@@ -286,10 +286,10 @@ 
 
 
 function isFull($myconn,$typedesc,$alltables) {
-        if (isset($alltables["$typedesc"]['limit'])) {
-                if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
-                        return TRUE;
-        }
+		if (isset($alltables["$typedesc"]['limit'])) {
+				if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
+						return TRUE;
+		}
 	return FALSE;
 }
 
@@ -302,14 +302,14 @@ 
 	if ($result) {
 		printf("<pre>Your request for $type &lt;$value&gt; returned %d items.\n</pre>", $result->num_rows);
 
-        /* Check for limit in number of listed items */
+		/* 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 ($result->num_rows) {
 			print '<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><th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
 			$i=0;
-        		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
+				while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
 					if ($tables["$typedesc"]['bl']) $listed='Listed';
 					else $listed='WhiteListed';
@@ -328,9 +328,9 @@ 
 					$element = $riga["$type"];
 				}
 
-                		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));
+						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 {
@@ -348,15 +348,15 @@ 
 
 function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
+		setlocale (LC_TIME, 'it_IT');
+		$date = date("r",$now);
 	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
 	$mua = 'PHP/' . phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
-    		syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
-    		exit;
+			syslog(LOG_ERR, 'Sending email... template file <'.$tplf['header'].'> not found!');
+			exit;
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
@@ -365,35 +365,35 @@ 
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
 	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
 
-        /* Parsing body */
+		/* Parsing body */
 
-        if (!file_exists($tplf['body'])) {
-                syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
-                exit;
-        }
+		if (!file_exists($tplf['body'])) {
+				syslog(LOG_ERR, 'Sending email... template file <'.$tplf['body'].'> not found!');
+				exit;
+		}
 
-        $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
-        $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
+		$body_tmpl = file_get_contents($tplf['body']);
+		$arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
+		$arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+		$body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
+		$body = preg_replace( "/\r|\n/", "\r\n", $body );
 	$body = wordwrap ( $body, 75 , "\r\n" );	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
-                $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;
-        }
-        return $flag;
+		if ( strlen(ini_get("safe_mode"))< 1) {
+				$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;
+		}
+		return $flag;
 }
 
 function emailToNotify($notify_file,$dom) {
@@ -407,59 +407,59 @@ 
 function searchAndList ($myconn,$loguser,$tables,$typedesc,$value,$unit,&$quantity,$reason) {
 
 /* Search and list value */
-        $type = $tables["$typedesc"]['field'];
-        $table = $tables["$typedesc"]['name'];
-        $result = searchentry ($myconn,$value,$tables["$typedesc"]);
-
-        /* Manage abnormal conditions */
-        /* Value already present in db more than once. This is absurd. Panic! */
-        if ($result->num_rows > 1) {
-                syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
-                $result->free();
-                return FALSE;
-        }
-
-        /* Value already present in db or not present: to list anyway */
-        if ($result->num_rows >= 0) {
-                /* First, check for limit in number of listed items */
-                if (isFull($myconn,$typedesc,$tables)) {
-                        syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
-                        $result->free();
-                        return FALSE;
-                }
-                /* Second, check if the (re)list would be consistent now */
-                if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
-                        syslog(LOG_ERR, $loguser.': '.$whynot);
-                        $result->free();
-                        return FALSE;
-                }
-        }
-        /* End of abnormal conditions */
-
-
-        /* Finally, here I can list the value! */
+		$type = $tables["$typedesc"]['field'];
+		$table = $tables["$typedesc"]['name'];
+		$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+
+		/* Manage abnormal conditions */
+		/* Value already present in db more than once. This is absurd. Panic! */
+		if ($result->num_rows > 1) {
+				syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
+				$result->free();
+				return FALSE;
+		}
+
+		/* Value already present in db or not present: to list anyway */
+		if ($result->num_rows >= 0) {
+				/* First, check for limit in number of listed items */
+				if (isFull($myconn,$typedesc,$tables)) {
+						syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
+						$result->free();
+						return FALSE;
+				}
+				/* Second, check if the (re)list would be consistent now */
+				if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
+						syslog(LOG_ERR, $loguser.': '.$whynot);
+						$result->free();
+						return FALSE;
+				}
+		}
+		/* End of abnormal conditions */
+
+
+		/* Finally, here I can list the value! */
 	$thisentry = $result->fetch_array(MYSQLI_ASSOC);
-        switch ($result->num_rows) {
-                /* Relist value if already present */
-                case 1:
-                        /* Entry already listed */
-                        if ( isListed($thisentry) ) {
-                                syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
-                                $result->free();
-                                return FALSE;
-                        }
-
-                        /* Entry delisted */
-                        $result->free();
+		switch ($result->num_rows) {
+				/* Relist value if already present */
+				case 1:
+						/* Entry already listed */
+						if ( isListed($thisentry) ) {
+								syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
+								$result->free();
+								return FALSE;
+						}
+
+						/* Entry delisted */
+						$result->free();
 			$quantity *= $thisentry['nlist'];
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+						return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
 
 
-                /* First time list value */
-                case 0:
-                        $result->free();
-                        return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
-        }
+				/* First time list value */
+				case 0:
+						$result->free();
+						return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+		}
 }
 
 

Spacing +104 added lines, -104 removed lines

@@ -1,25 +1,25 @@ 
 <?php
 
-$version='1.9d';
+$version = '1.9d';
 
 function username() {
 	if (isset ($_SERVER['REMOTE_USER'])) $user = $_SERVER['REMOTE_USER'];
         	else if (isset ($_SERVER['USER'])) $user = $_SERVER['USER'];
-                	else $user='unknown';
+                	else $user = 'unknown';
 	return $user;
 }
 
 
-function addtolist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason) {
+function addtolist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason) {
 // See MySQL manual for $expQ and $expUnit at
 // https://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html#function_timestampadd
 
-	$result=FALSE;
-	$sub=array();
+	$result = FALSE;
+	$sub = array();
 
 	switch ($type) {
 	  case 'ip':
-		$query= sprintf("INSERT INTO `$table` (
+		$query = sprintf("INSERT INTO `$table` (
 			`$type` ,
 			`date` ,
 			`exp` ,
@@ -30,12 +30,12 @@ 
 		VALUES (
 			INET_ATON( '%s' ) ,
 			CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-		)" ,$value,$expUnit,$expQ,$user,$myreason);
+		)", $value, $expUnit, $expQ, $user, $myreason);
 		break;
 
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("INSERT INTO `$table` (
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
 			`netmask`,
                         `date` ,
@@ -47,11 +47,11 @@ 
                 VALUES (
                         INET_ATON( '%s' ) , INET_ATON( '%s' ) ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$sub['net'],$sub['mask'],$expUnit,$expQ,$user,$myreason);
+                )", $sub['net'], $sub['mask'], $expUnit, $expQ, $user, $myreason);
                 break;
 
 	  default:
-                $query= sprintf("INSERT INTO `$table` (
+                $query = sprintf("INSERT INTO `$table` (
                         `$type` ,
                         `date` ,
                         `exp` ,
@@ -62,60 +62,60 @@ 
                 VALUES (
                         '%s' ,
                         CURRENT_TIMESTAMP , TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP), '1', '%s', '%s'
-                )" ,$value,$expUnit,$expQ,$user,$myreason);
+                )", $value, $expUnit, $expQ, $user, $myreason);
 	}
 
 	if ($myconn->query($query) === TRUE) {
 	    syslog(LOG_INFO, "$user: $type <$value> successfully listed on <$table> for $expQ $expUnit.");
-	    $result=TRUE;
+	    $result = TRUE;
 	}
 	else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function relist ($myconn,$user,$value,$type,$table,$expUnit,$expQ,$myreason) {
+function relist($myconn, $user, $value, $type, $table, $expUnit, $expQ, $myreason) {
 
-	$result=FALSE;
+	$result = FALSE;
 
         switch ($type) {
 	  case 'ip':
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
 			`active` = '1',
 			`user` = '%s',
 			`exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
 			`nlist` = `nlist` + 1,
 			`reason` = '%s'
-			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 		break;
           case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-                $query= sprintf("UPDATE `$table` SET
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$sub['net'],$sub['mask']);
+                        WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $expUnit, $expQ, $myreason, $sub['net'], $sub['mask']);
 		break;
 	  default:
-                $query= sprintf("UPDATE `$table` SET
+                $query = sprintf("UPDATE `$table` SET
                         `active` = '1',
                         `user` = '%s',
                         `exp` = TIMESTAMPADD(%s,%d,CURRENT_TIMESTAMP),
                         `nlist` = `nlist` + 1,
                         `reason` = '%s'
-			WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user,$expUnit,$expQ,$myreason,$value);
+			WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $expUnit, $expQ, $myreason, $value);
 	}
 
         if ($myconn->query($query) === TRUE) {
             syslog(LOG_INFO, "$user: relist $type <$value> on <$table> for $expQ $expUnit.");
-		$result=TRUE;
+		$result = TRUE;
         }
-        else syslog (LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 	return $result;
 }
 
-function remove ($myconn,$user,$value,$type,$table) {
+function remove($myconn, $user, $value, $type, $table) {
 
         switch ($type) {
           case 'ip':
@@ -123,10 +123,10 @@ 
                         `$table`.`$type` = INET_ATON('%s') LIMIT 1", $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
 		$query = sprintf("DELETE FROM `$table` WHERE
 			`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s') LIMIT 1",
-			$sub['net'],$sub['mask']);
+			$sub['net'], $sub['mask']);
 		break;
 	  default:
 		$query = sprintf("DELETE FROM `$table` WHERE
@@ -134,39 +134,39 @@ 
 	}
 
 
-        if ($return=$myconn->query($query) === TRUE) 
+        if ($return = $myconn->query($query) === TRUE) 
             syslog(LOG_INFO, "$user: permanently DELETED $type <$value> from <$table>.");
-        else syslog(LOG_ERR, "$user: Error: ". $myconn->error);
+        else syslog(LOG_ERR, "$user: Error: ".$myconn->error);
 
         return $return;
 }
 
 
-function changestatus ($myconn,$user,$value,$status,$type,$table) {
+function changestatus($myconn, $user, $value, $status, $type, $table) {
 
 	switch ($type) {
           case 'ip':
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = INET_ATON('%s') LIMIT 1", $user, $value);
 		break;
 	  case 'network':
-		list($sub['net'],$sub['mask'])=explode('/',$value);
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1" ,$user, $sub['net'],$sub['mask']);
+		list($sub['net'], $sub['mask']) = explode('/', $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE (`$table`.`$type` = INET_ATON('%s') AND `$table`.`netmask` = INET_ATON('%s')) LIMIT 1", $user, $sub['net'], $sub['mask']);
 		break;
 	  default:
-		$query= sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1" ,$user, $value);
+		$query = sprintf("UPDATE `$table` SET `active` = '$status', `user` = '%s' WHERE `$table`.`$type` = '%s' LIMIT 1", $user, $value);
 	}
 
-        if ($return=$myconn->query($query) === TRUE) {
+        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;	
 }
 
 
-function expire ($myconn,$user,$tables,$expireTime) {
-        $return=TRUE;
-	$log=array();
+function expire($myconn, $user, $tables, $expireTime) {
+        $return = TRUE;
+	$log = array();
 	$desc = array_keys($tables);
 	foreach ($desc as $tdesc) { 
 		/* QUERY */
@@ -185,11 +185,11 @@ 
 			} while ($myconn->next_result());
 		}
 		else {
-			syslog(LOG_ERR, "Expire job - Error: ". $myconn->error);
+			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');
+	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;
 }
@@ -197,22 +197,22 @@ 
 
 function isListed($row) {
 
-	$exp=new DateTime($row['exp']);
-	$now=new DateTime('NOW');
-	if (($exp > $now) and ($row['active'])) return true;
+	$exp = new DateTime($row['exp']);
+	$now = new DateTime('NOW');
+	if (($exp>$now) and ($row['active'])) return true;
 	else return false;
 
 }
 
 
-function ask($myconn,$id,$what,$alltables,$typedesc,$value,$lock,$user,$adm) {
+function ask($myconn, $id, $what, $alltables, $typedesc, $value, $lock, $user, $adm) {
 
-	$whynot=NULL;
+	$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 (in_array($user, array_keys($adm)))
+				if (consistentListing($myconn, $alltables, $typedesc, $value, $whynot)) return require('relistButton.php');
 			return htmlspecialchars($whynot);
 		case 'Listed':
 		case 'WhiteListed':
@@ -221,17 +221,17 @@ 
 }
 
 
-function consistentListing($myconn,$alltables,$typed,$value,&$warn) {
+function consistentListing($myconn, $alltables, $typed, $value, &$warn) {
 /* Check if there are no pending mislisting */
 	$warn = NULL;
 	foreach ($alltables["$typed"]['depend'] as $listdep) {
-		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field'] ) {
+		if ($alltables["$typed"]['field'] != $alltables["$listdep"]['field']) {
 			$warn = "Config ERROR: <$typed> and <$listdep> are of different types! I can't check consistency!";
 			return FALSE;
 		}
-		$entry = searchentry($myconn,$value,$alltables["$listdep"]);
-		if ( $entry->num_rows ) {
-			if ( $entry->num_rows == 1 ) {
+		$entry = searchentry($myconn, $value, $alltables["$listdep"]);
+		if ($entry->num_rows) {
+			if ($entry->num_rows == 1) {
 				$riga = $entry->fetch_array(MYSQLI_ASSOC);
                         	if (isListed($riga)) {
 					$warn = "<$value> is already present in <$listdep> list!";
@@ -239,7 +239,7 @@ 
 					return FALSE;
 				}
 			}
-			if ( $entry->num_rows > 1 ) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!";}
+			if ($entry->num_rows>1) {$warn = "<$value> seems to be present more than once in <$listdep>. Contact a sysadmin NOW!"; }
 		}
 		$entry->free();
 	}
@@ -247,7 +247,7 @@ 
 	return TRUE;
 }
 
-function searchentry ($myconn,$value,$tablelist) {
+function searchentry($myconn, $value, $tablelist) {
 /* Make a MYSQL query and return result */
 
         $type = $tablelist['field'];
@@ -257,24 +257,24 @@ 
         else {
                 switch ($type) {
                   case 'ip':
-                        $query= "select * from $table where $type =  INET_ATON('$value')";
+                        $query = "select * from $table where $type =  INET_ATON('$value')";
                         break;
                   case 'network':
-                        list($sub['net'],$sub['mask'])=explode('/',$value);
-                        $query= 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
+                        list($sub['net'], $sub['mask']) = explode('/', $value);
+                        $query = 'select * from '.$table.' where (((inet_aton(\''.$sub['net'].'\') | (~ inet_aton(\''.$sub['mask'].'\'))) & netmask) = network)';
                         break;
                   default:
-                        $query= "select * from $table where $type = '$value'";
+                        $query = "select * from $table where $type = '$value'";
                 }
         }
 
 	$result = $myconn->query($query);
-	if($result === false)
+	if ($result === false)
 		syslog(LOG_EMERG, "ALERT: Query <$query> failed: ".$myconn->error);
         return $result;
 }
 
-function countListed ($myconn,$table) {
+function countListed($myconn, $table) {
 /* Return number of current listed items into a rbl table */
 	$query = "SELECT COUNT(*) as `count` FROM `$table` WHERE (`active`=1 AND TIMESTAMPDIFF(MICROSECOND,NOW(),`exp`)>0) GROUP BY `active` ORDER BY `count` DESC LIMIT 1";
 	$row = $myconn->query($query);
@@ -285,37 +285,37 @@ 
 }
 
 
-function isFull($myconn,$typedesc,$alltables) {
+function isFull($myconn, $typedesc, $alltables) {
         if (isset($alltables["$typedesc"]['limit'])) {
-                if ( countListed($myconn,$alltables["$typedesc"]['name']) >= $alltables["$typedesc"]['limit'] ) 
+                if (countListed($myconn, $alltables["$typedesc"]['name'])>=$alltables["$typedesc"]['limit']) 
                         return TRUE;
         }
 	return FALSE;
 }
 
-function rlookup ($myconn,$user,$adm,$value,$typedesc,$tables) {
+function rlookup($myconn, $user, $adm, $value, $typedesc, $tables) {
 
 	$type = $tables["$typedesc"]['field'];
-	$whynot=NULL;
+	$whynot = NULL;
 
-	$result = searchentry ($myconn,$value,$tables["$typedesc"]);
+	$result = searchentry($myconn, $value, $tables["$typedesc"]);
 	if ($result) {
 		printf("<pre>Your request for $type &lt;$value&gt; returned %d items.\n</pre>", $result->num_rows);
 
         /* Check for limit in number of listed items */
-	$full = isFull($myconn,$typedesc,$tables);
+	$full = isFull($myconn, $typedesc, $tables);
 	if ($full) print '<p>'.htmlspecialchars("$typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items.').'</p>';
 
 		if ($result->num_rows) {
 			print '<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><th>Authored by</th><th width="250">Reason</th><th>Action</th></tr></thead><tfoot><tr></tr></tfoot><tbody>'."\n";
-			$i=0;
+			$i = 0;
         		while ($riga = $result->fetch_array(MYSQLI_ASSOC)) {
 				if (isListed($riga)) {
-					if ($tables["$typedesc"]['bl']) $listed='Listed';
-					else $listed='WhiteListed';
+					if ($tables["$typedesc"]['bl']) $listed = 'Listed';
+					else $listed = 'WhiteListed';
 				}	
 				else
-					$listed='Ok';
+					$listed = 'Ok';
 
 				switch ($type) {
 				  case 'ip':
@@ -328,15 +328,15 @@ 
 					$element = $riga["$type"];
 				}
 
-                		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));
+                		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 {
 			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');
+			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>';
 				
 		}
@@ -346,12 +346,12 @@ 
 }
 
 
-function sendEmailWarn($tplf,$from,$to,$sbj,$emailListed,$intervalToExpire,$detail) {
+function sendEmailWarn($tplf, $from, $to, $sbj, $emailListed, $intervalToExpire, $detail) {
 	$now = time();
-        setlocale (LC_TIME, 'it_IT');
-        $date = date("r",$now);
-	$messageID = md5(uniqid($now,1)) . '@' . $_SERVER["HOSTNAME"];
-	$mua = 'PHP/' . phpversion();
+        setlocale(LC_TIME, 'it_IT');
+        $date = date("r", $now);
+	$messageID = md5(uniqid($now, 1)).'@'.$_SERVER["HOSTNAME"];
+	$mua = 'PHP/'.phpversion();
 
 	/* Parsing headers */
 	if (!file_exists($tplf['header'])) {
@@ -360,10 +360,10 @@ 
 	}
 
 	$head_tmpl = file_get_contents($tplf['header']);
-	$arr_tpl_vars = array('{from}','{to}','{date}','{messageID}','{mua}');
-	$arr_tpl_data = array($from,$to,$date,$messageID,$mua);
+	$arr_tpl_vars = array('{from}', '{to}', '{date}', '{messageID}', '{mua}');
+	$arr_tpl_data = array($from, $to, $date, $messageID, $mua);
 	$headers = str_replace($arr_tpl_vars, $arr_tpl_data, $head_tmpl);
-	$headers = preg_replace( '/\r|\n/', "\r\n", $headers );
+	$headers = preg_replace('/\r|\n/', "\r\n", $headers);
 
         /* Parsing body */
 
@@ -373,62 +373,62 @@ 
         }
 
         $body_tmpl = file_get_contents($tplf['body']);
-        $arr_tpl_vars = array('{emailListed}','{expInterval}','{reason}');
-        $arr_tpl_data = array($emailListed,$intervalToExpire,$detail);
+        $arr_tpl_vars = array('{emailListed}', '{expInterval}', '{reason}');
+        $arr_tpl_data = array($emailListed, $intervalToExpire, $detail);
         $body = str_replace($arr_tpl_vars, $arr_tpl_data, $body_tmpl);
-        $body = preg_replace( "/\r|\n/", "\r\n", $body );
-	$body = wordwrap ( $body, 75 , "\r\n" );	
+        $body = preg_replace("/\r|\n/", "\r\n", $body);
+	$body = wordwrap($body, 75, "\r\n");	
 
 	/* Send the mail! */
-        if ( strlen(ini_get("safe_mode"))< 1) {
+        if (strlen(ini_get("safe_mode"))<1) {
                 $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 (!(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))) $flag = FALSE;
+                else $flag = TRUE;
         }
         return $flag;
 }
 
-function emailToNotify($notify_file,$dom) {
+function emailToNotify($notify_file, $dom) {
 	$ini_array = parse_ini_file($notify_file);
-	if (in_array($dom,array_keys($ini_array)))
+	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) {
+function searchAndList($myconn, $loguser, $tables, $typedesc, $value, $unit, &$quantity, $reason) {
 
 /* Search and list value */
         $type = $tables["$typedesc"]['field'];
         $table = $tables["$typedesc"]['name'];
-        $result = searchentry ($myconn,$value,$tables["$typedesc"]);
+        $result = searchentry($myconn, $value, $tables["$typedesc"]);
 
         /* Manage abnormal conditions */
         /* Value already present in db more than once. This is absurd. Panic! */
-        if ($result->num_rows > 1) {
-                syslog(LOG_EMERG,"$loguser: PANIC! Select for $type '$value' returned ". $result->num_rows ." items instead of one. Abnormal. Contact a sysadmin or a developer.");
+        if ($result->num_rows>1) {
+                syslog(LOG_EMERG, "$loguser: PANIC! Select for $type '$value' returned ".$result->num_rows." items instead of one. Abnormal. Contact a sysadmin or a developer.");
                 $result->free();
                 return FALSE;
         }
 
         /* Value already present in db or not present: to list anyway */
-        if ($result->num_rows >= 0) {
+        if ($result->num_rows>=0) {
                 /* First, check for limit in number of listed items */
-                if (isFull($myconn,$typedesc,$tables)) {
-                        syslog(LOG_EMERG,"$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
+                if (isFull($myconn, $typedesc, $tables)) {
+                        syslog(LOG_EMERG, "$loguser: $typedesc has reached maximum value of ".$tables["$typedesc"]['limit'].' listed items. Abnormal exit.');
                         $result->free();
                         return FALSE;
                 }
                 /* Second, check if the (re)list would be consistent now */
-                if (! consistentListing($myconn,$tables,$typedesc,$value,$whynot) ) {
+                if (!consistentListing($myconn, $tables, $typedesc, $value, $whynot)) {
                         syslog(LOG_ERR, $loguser.': '.$whynot);
                         $result->free();
                         return FALSE;
@@ -443,7 +443,7 @@ 
                 /* Relist value if already present */
                 case 1:
                         /* Entry already listed */
-                        if ( isListed($thisentry) ) {
+                        if (isListed($thisentry)) {
                                 syslog(LOG_INFO, $loguser.': '.$value.' already listed. Nothing to do.');
                                 $result->free();
                                 return FALSE;
@@ -452,13 +452,13 @@ 
                         /* Entry delisted */
                         $result->free();
 			$quantity *= $thisentry['nlist'];
-                        return relist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return relist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
 
 
                 /* First time list value */
                 case 0:
                         $result->free();
-                        return addtolist ($myconn,$loguser,$value,$type,$table,$unit,$quantity,$reason);
+                        return addtolist($myconn, $loguser, $value, $type, $table, $unit, $quantity, $reason);
         }
 }
 

result.php

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

remove.php

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