falon / RBL

contrib/splunk/webhook/readPost.php

Spacing +33 added lines, -33 removed lines

@@ -16,11 +16,11 @@ 
 
 /************** Conf *******************/
 $base = '/var/www/html/RBL';
-require_once($base . '/config.php');
+require_once($base.'/config.php');
 
  /* Syslog basic */
-$tag            .= 'SplunkLister';
-$user		 = 'Splunk';
+$tag .= 'SplunkLister';
+$user = 'Splunk';
 
 openlog($tag, LOG_PID, $fac);
 
@@ -28,43 +28,43 @@ 
 if (!isset($_GET['conf'])) {
         syslog(LOG_ALERT,
         sprintf('%s: you must insert the config file name as a GET parameter, such as %s?conf=listEmail.conf',
-                $user, $_SERVER['SCRIPT_NAME']) );
+                $user, $_SERVER['SCRIPT_NAME']));
         exit(254);
 }
 $fileconf = $_GET['conf'];
-if ( !file_exists(dirname(__FILE__) . '/../' . $fileconf) ) {
+if (!file_exists(dirname(__FILE__).'/../'.$fileconf)) {
         syslog(LOG_ALERT,
         sprintf('%s: the configuration file <%s> doesn\'t exist.',
-                $user, $fileconf ));
+                $user, $fileconf));
         exit(254);
 }
 
 closelog();
-$conf = parse_ini_file( dirname(__FILE__) . '/../' . $fileconf );
+$conf = parse_ini_file(dirname(__FILE__).'/../'.$fileconf);
 
  /* Splunk inherited parameters */
-$threshold = $conf['threshold'];         /* Threshold value on trigger condition; the same which engage the alert */
+$threshold = $conf['threshold']; /* Threshold value on trigger condition; the same which engage the alert */
 
  /* Blacklist name */
 $typedesc  = $conf['typedesc'];
 
  /* How long to list's parameters */
-$unit = $conf['unit'];          /* MySQL language ;) */
+$unit = $conf['unit']; /* MySQL language ;) */
 
  /* Syslog extended info */
-$tag            .= $conf['tag'];
+$tag .= $conf['tag'];
 
  /* Splunk password of alert owner*/
 $splpwd = $conf['splunkpassword'];
 /************** End of conf *************************/
 
 openlog($tag, LOG_PID, $fac);
-require_once($base . '/function.php');
+require_once($base.'/function.php');
 
 
 /* check you select a blocklist */
-if ( !$tables["$typedesc"]['bl'] ) {
-        syslog(LOG_EMERG,"$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
+if (!$tables["$typedesc"]['bl']) {
+        syslog(LOG_EMERG, "$user: <$typedesc> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.");
         exit (254);
 }
 
@@ -96,14 +96,14 @@ 
 	$webhook['results_link'], $out, PREG_PATTERN_ORDER) === FALSE) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: can\'t parse the results link returned by webhook (<%s>).',
-		$user, $webhook['results_link']) );
+		$user, $webhook['results_link']));
 	return 255;
 }
 
-if ( $webhook['app'] != $out['splunkapp'][0] ) {
+if ($webhook['app'] != $out['splunkapp'][0]) {
 	syslog(LOG_ALERT,
         	sprintf('%s: unexpected error: the APP returned by webhook (<%s>) doesn\'t match the app (<%s>) in result link.',
-                $user, $webhook['app'], $out['splunkapp'][0] ) );
+                $user, $webhook['app'], $out['splunkapp'][0]));
 	return 255;
 }
 
@@ -135,13 +135,13 @@ 
 
 $tolist = array();
 
-$nr = count ($results);
-for ($i=1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
+$nr = count($results);
+for ($i = 1; $i<$nr; $i++) {	/* We skip first header line (i=0) */
         $data = str_getcsv($results[$i], ',');
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
+        if (!in_array($thisVal, array_keys($tolist)))
 	        $tolist["$thisVal"] = $data;
         else if ($data[3]>$tolist[$thisVal][3])
 	        $tolist["$thisVal"] = $data;
@@ -150,42 +150,42 @@ 
 /* Make MYSQL connection */
 
 $mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user);
-if ( $mysqli === FALSE )
+if ($mysqli === FALSE)
 	exit (254);
 
-foreach ( array_keys($tolist) as $value) {
+foreach (array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
         $reason = 'On ['.$tolist["$value"][0]."] <$value> sent ".$tolist["$value"][1].' messages to '.$tolist["$value"][2].' recipients.';
-        if ( $tolist["$value"][3] >= $threshold ) {
-                if ( searchAndList ($mysqli,$user,$tables,$typedesc,$value,$unit,$quantity,$reason) ) {
-                        syslog (LOG_INFO, "$user: ".'Listing reason: '.$reason);
+        if ($tolist["$value"][3]>=$threshold) {
+                if (searchAndList($mysqli, $user, $tables, $typedesc, $value, $unit, $quantity, $reason)) {
+                        syslog(LOG_INFO, "$user: ".'Listing reason: '.$reason);
                         /* Send a email to domain admin if you list an email */
-                        if ( ( $tables["$typedesc"]['field'] == 'email' ) OR ( $tables["$typedesc"]['field'] == 'username' ) ) {
+                        if (($tables["$typedesc"]['field'] == 'email') OR ($tables["$typedesc"]['field'] == 'username')) {
                                 /* Sometime uid are in the form of <user>@<domain> ... */
-                                if ( strpos($value, '@') !== FALSE ) {
+                                if (strpos($value, '@') !== FALSE) {
                                         $domain = substr(strrchr($value, '@'), 1);
-                                        if ( strpos($domain, '@') === FALSE ) {
-                                                $recip = emailToNotify($domainNotify_file,$domain);
+                                        if (strpos($domain, '@') === FALSE) {
+                                                $recip = emailToNotify($domainNotify_file, $domain);
                                                 $subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
                                                                 $tables["$typedesc"]['field'], $value);
                                                 if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
-                                                                $subject,$value,"$quantity $unit",$reason) )
+                                                        if (sendEmailWarn($tplfile, 'postmaster@csi.it', $recip,
+                                                                $subject, $value, "$quantity $unit", $reason))
                                                                 syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
                                         }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
+                                        else syslog(LOG_ERR, "$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                 }
                         }
                 }
         }
         else {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
-                syslog (LOG_INFO, "$user: ".$reason);
+                syslog(LOG_INFO, "$user: ".$reason);
         }
 }
 
 /* Close connection */
-syslog (LOG_INFO, "$user: ".'Successfully end of session.');
+syslog(LOG_INFO, "$user: ".'Successfully end of session.');
 $mysqli->close();
 closelog();
 

Braces +14 added lines, -11 removed lines

@@ -141,17 +141,19 @@ 
         $thisVal = $data[1];
         unset($data[1]);
         $data = array_values($data);
-        if ( !in_array($thisVal,array_keys($tolist))  )
-	        $tolist["$thisVal"] = $data;
-        else if ($data[3]>$tolist[$thisVal][3])
-	        $tolist["$thisVal"] = $data;
-}
+        if ( !in_array($thisVal,array_keys($tolist))  ) {
+        	        $tolist["$thisVal"] = $data;
+        } else if ($data[3]>$tolist[$thisVal][3]) {
+        	        $tolist["$thisVal"] = $data;
+        }
+        }
 
 /* Make MYSQL connection */
 
 $mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $typedesc, $user);
-if ( $mysqli === FALSE )
+if ( $mysqli === FALSE ) {
 	exit (254);
+}
 
 foreach ( array_keys($tolist) as $value) {
         $quantity = $conf['quantity'];
@@ -168,17 +170,18 @@ 
                                                 $recip = emailToNotify($domainNotify_file,$domain);
                                                 $subject = sprintf('%s <%s> is now blocked because exceedes limits on outgoing emails',
                                                                 $tables["$typedesc"]['field'], $value);
-                                                if (!empty($recip))
-                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
+                                                if (!empty($recip)) {
+                                                                                                        if ( sendEmailWarn($tplfile,'postmaster@csi.it',$recip,
                                                                 $subject,$value,"$quantity $unit",$reason) )
                                                                 syslog(LOG_INFO, "$user: \"$recip\" was notified about the \"$value\" abuse.");
+                                                }
+                                        } else {
+                                        	syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                         }
-                                        else syslog(LOG_ERR,"$user: <$domain> contains the '@' char. Notification cannot be sent.");
                                 }
                         }
                 }
-        }
-        else {
+        } else {
                 $reason .= " But it has NOT been listed because it doesn't apply to the trigger condition.";
                 syslog (LOG_INFO, "$user: ".$reason);
         }