falon / RBL

contrib/mailClassifier/function.php

Spacing +85 added lines, -87 removed lines

@@ -1,56 +1,56 @@ 
 <?php
 
 function imapFolder($cf, $username) {
-	$open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
+	$open = '{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}';
         $m_mail = imap_open($open, $username, $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);
+                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'].'>; Listing folders of account <'.$username.'>...');
+        syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
         //get all folder
 	$list = imap_list($m_mail, $open, "*");
 	imap_close($m_mail);
 	if (is_array($list))
 		foreach ($list as $mbox)
-			$return[] = explode($open,$mbox,2)[1];
+			$return[] = explode($open, $mbox, 2)[1];
 	else
-		syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+		syslog(LOG_INFO, $cf['user'].': imap_list failed: '.imap_last_error());
 	return $return;
 }
 
-function imapFind ($cf, $username, $folder) {
-	$head=array();
-	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$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 imapFind($cf, $username, $folder) {
+	$head = array();
+	$m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username, $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 <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
+	syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...');
 	//get all messages
-	$dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) );
-	$m_search=imap_search ($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \"" );
+	$dateTh = date("d-M-Y", strToTime('-'.$cf['oldestday'].' days'));
+	$m_search = imap_search($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \"");
 
 
 	// Order results starting from newest message
-	if ( empty($m_search) ) {
-		syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder.");
-	        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 (empty($m_search)) {
+		syslog(LOG_INFO, $cf['user'].": No suitable mail found in <$folder> folder.");
+	        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);
 		return FALSE;
 	}
-	$nmes = count ($m_search);
-	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
+	$nmes = count($m_search);
+	syslog(LOG_INFO, $cf['user'].": Found $nmes mail in <$folder> folder.");
 	if ($nmes>0) rsort($m_search);
 
         // loop for each message
 	foreach ($m_search as $onem) 
-		$head[] = imap_fetchheader($m_mail, $onem );
+		$head[] = imap_fetchheader($m_mail, $onem);
 	imap_close($m_mail);
 	return $head;
 }
@@ -58,11 +58,11 @@ 
 function dspamLevel($prob, $conf) {
 /* Calculate DSPAM Level as the Spamassassin Plugin */
 	if (is_null($prob) or is_null($conf)) return '-';
-	$t_prob = abs((($prob - 0.5) * 2) * 100);
-	return round(($t_prob + ($conf*100)) / 2);
+	$t_prob = abs((($prob-0.5) * 2) * 100);
+	return round(($t_prob+($conf * 100)) / 2);
 }
 
-function imapInfo($header,$ARhosts,$dpl=false, $learn=false) {
+function imapInfo($header, $ARhosts, $dpl = false, $learn = false) {
 /* Get relevant Info from header's mail */
 /* Each line must end with /r/n         */
 
@@ -98,118 +98,118 @@ 
         );
 		
 
-        if ( preg_match_all ('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m',$header,$received) ) {
-		$k=0;
-                for ($i = count($received[0])-1;$i>=0;$i--) {
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dmarc=(?<dmarc>\w+)\s+\(p=\w+\s+dis=\w+\)\s+header\.from=(?<DMARCfrom>[\w\.]+)/m', $header, $received)) {
+		$k = 0;
+                for ($i = count($received[0])-1; $i>=0; $i--) {
 	                foreach ($ARhosts as $mx) {
 				if ($mx == $received['host'][$i]) {
 					/* This is a trusted AR result */
-					$result['dmarc']['result']=$received['dmarc'][$i];
+					$result['dmarc']['result'] = $received['dmarc'][$i];
 					$result['dmarc']['dom'] = $received['DMARCfrom'][$i];
 					$k++;
 				}
                 	}
 		}
         }
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
 
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m',$header,$received) ) {
-		$k=0;
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)spf=(?<spf>\w+)\s+smtp\.(?:mailfrom|helo)=(?<SPFfrom>[\w\.]+)/m', $header, $received)) {
+		$k = 0;
+		for ($i = count($received[0])-1; $i>=0; $i--) {
 			foreach ($ARhosts as $mx) {
 				if ($mx == $received['host'][$i]) {
 					/* This is a trusted AR result */
-					$result['spf']['result']=$received['spf'][$i];
+					$result['spf']['result'] = $received['spf'][$i];
 					$result['spf']['dom'] = $received['SPFfrom'][$i];
 					$k++;
                         	}
                 	}
         	}
 	}
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
 
-        if ( preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m',$header,$received) ) {
-		$k=0;
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+        if (preg_match_all('/^Authentication\-Results:\s+(?<host>[\w\.]+);(?:\s+|\r\n\s+)dkim=(?<dkim>\w+)\s+[\w\s\(\)\-]+header\.d=(?<DKIMdom>[\w\.]+)/m', $header, $received)) {
+		$k = 0;
+		for ($i = count($received[0])-1; $i>=0; $i--) {
 	                foreach ($ARhosts as $mx) {
         	                if ($mx == $received['host'][$i]) {
                 	                /* This is a trusted AR result */
-                        	        $result['dkim']['result']=$received['dkim'][$i];
+                        	        $result['dkim']['result'] = $received['dkim'][$i];
                                 	$result['dkim']['dom'] = $received['DKIMdom'][$i];
 					$k++;
                         	}
                 	}
         	}
 	}
-	$received=NULL;
+	$received = NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
 
 	if ($dpl) { /* Use Spamassassin Plugin */
-		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m',$header,$received) ) {
-			$result['spam']['status']=$received['spamstatus'][0];
+		if (preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*DSPAM_(?P<dtype>SPAM|HAM)_(?P<dlevel>\d\d)(?:.|\r\n\s+)*\]/m', $header, $received)) {
+			$result['spam']['status'] = $received['spamstatus'][0];
                 	$result['spam']['score'] = $received['score'][0];
 			$result['spam']['th'] = $received['th'][0];
 			$result['dspam']['type'] = $received['dtype'][0];
-			$result['dspam']['level'] =$received['dlevel'][0];
+			$result['dspam']['level'] = $received['dlevel'][0];
         	}
         	if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
 	}
 	else { /* Parse apart all DSPAM Header and calculate a level */
-		if ( preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m',$header,$received) ) {
-                        $result['spam']['status']=$received['spamstatus'][0];
+		if (preg_match_all('/^X\-Spam\-Status:\s(?P<spamstatus>\w+)\,(?:\s+|\r\n\s+)score=(?P<score>[\-\.\d]+)(?:\s+|\r\n\s+)tagged_above=\-{0,1}\d+(?:\s+|\r\n\s+)required=(?P<th>[\-\.\d]+)(?:\s+|\r\n\s+)tests=\[(?:.|\r\n\s+)*\]/m', $header, $received)) {
+                        $result['spam']['status'] = $received['spamstatus'][0];
                         $result['spam']['score'] = $received['score'][0];
                         $result['spam']['th'] = $received['th'][0];
 			if (count($received[0])>1)
-				$result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.';
+				$result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.';
 		}
-		if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1)
+		if (preg_match('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/', $header, $received) != 1)
 	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
 	        else
-                	$result['dspam']['type']=$received['result'];
+                	$result['dspam']['type'] = $received['result'];
 		$prob = NULL;
 		$conf = NULL;
-                if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1)
+                if (preg_match('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/', $header, $received) != 1)
                         $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.';
 		else
 			$prob = $received['prob'];
-		if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1)
+		if (preg_match('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/', $header, $received) != 1)
                         $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
 		else
 			$conf = $received['conf'];
-		$result['dspam']['level'] = dspamLevel($prob,$conf);
+		$result['dspam']['level'] = dspamLevel($prob, $conf);
 	}
-	$received=NULL;
-	if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1)
+	$received = NULL;
+	if (preg_match('/\r\nFrom:\s(?P<from>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'From header invalid or not present';
         else
                 $result['from'] = $received['from'];
 
-        if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1)
+        if (preg_match('/\r\nDate:\s(?P<date>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'Date header invalid or not present';
 	else
 		$result['date'] = $received['date'];
 
-	$received=NULL;
-        if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1)
+	$received = NULL;
+        if (preg_match('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/', $header, $received) != 1)
                 $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
 	else
-		$result['messageid']=$received['mid'];
+		$result['messageid'] = $received['mid'];
 
-        $received=NULL;
+        $received = NULL;
 
         switch ($learn) {
 		case 'dspamc':
-        		if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1)
+        		if (preg_match('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/', $header, $received) != 1)
 				$result['warn'] = 'DSPAM Signature invalid, not present or present more than once.';
 			else
-				$result['dspam']['learn']=$received['sig'];			
+				$result['dspam']['learn'] = $received['sig'];			
 			break;
 		case false:
 			break;
 		default:
-			syslog (LOG_INFO,$user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
+			syslog(LOG_INFO, $user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
 	}
 	
         return $result;
@@ -218,7 +218,7 @@ 
 
 
 
-function printTableHeader($title,$content,$footer=FALSE,$fcontent) {
+function printTableHeader($title, $content, $footer = FALSE, $fcontent) {
         print <<<END
 	<caption>$title</caption>
 	<thead>
@@ -226,21 +226,19 @@ 
 END;
 	$kcontent = array_keys($content);
         $cols = count($kcontent);
-        for ($i=0; $i<$cols; $i++) {
+        for ($i = 0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-                printf ('<th colspan="%d" rowspan="%d">%s</th>',
-			!is_array($content[$key]) ?:
-			count(array_keys($content[$key])) ?: '1',
-			!is_array($content[$key]) ?:
-			empty(array_keys($content[$key])) ? '2' : '1',
+                printf('<th colspan="%d" rowspan="%d">%s</th>',
+			!is_array($content[$key]) ?: count(array_keys($content[$key])) ?: '1',
+			!is_array($content[$key]) ?: empty(array_keys($content[$key])) ? '2' : '1',
 			$kcontent[$i]);
 	}
 	print '</tr><tr>';
-	for ($i=0; $i<$cols; $i++) {
+	for ($i = 0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-		if (is_array($content[$key])&&($hs = array_keys($content[$key]))) {
+		if (is_array($content[$key]) && ($hs = array_keys($content[$key]))) {
 			foreach ($hs as $h)
-				printf('<th>%s</th>',$h);
+				printf('<th>%s</th>', $h);
 		}
 	}
 		
@@ -256,7 +254,7 @@ 
 
 function formatVal($val, $learn) {
 	foreach (array_keys($val) as $key) {
-		if (is_array($val["$key"]) and ($key!='warn'))
+		if (is_array($val["$key"]) and ($key != 'warn'))
 			$val["$key"] = formatVal($val["$key"], $learn);
 		else {
 			switch ($key) {
@@ -264,7 +262,7 @@ 
 					if (empty($val["$key"]))
 						$val["$key"] = '-';
 					else 
-						$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+						$val["$key"] = sprintf('<div title="%s">Y</div>', implode($val["$key"], "\n"));
 					break;
 				case 'learn':
 					$val["$key"] = formLearn($learn, $val);
@@ -286,9 +284,9 @@ 
 				$par['class'] = $class;
 				$val["$class"] = sprintf('dspamc --user dspam --deliver=summary --class=%s --source=error --signature=%s',
 							strtolower($class), $par['learn']);
-				if (($class != $par['type'])||($par['level']<99))
+				if (($class != $par['type']) || ($par['level']<99))
 					$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
-						$class,$class,$val["$class"],base64_encode(json_encode($par)),$class);
+						$class, $class, $val["$class"], base64_encode(json_encode($par)), $class);
 			}
 		default:
 			return $return;
@@ -296,18 +294,18 @@ 
 	return $return;
 }
 
-function printTableRow($row, $learn, $init=true) {
+function printTableRow($row, $learn, $init = true) {
 	$bg = NULL;
 	$color = 'inherit';
 	if ($init) 
-		$row=formatVal($row,$learn);
-	foreach( $row as $key => $val) {
+		$row = formatVal($row, $learn);
+	foreach ($row as $key => $val) {
 		if (is_array($val))
 			printTableRow($val, $learn, false);
 		else {
 			/* DSPAM format */
 			if (isset($row['type']))
-				switch($row['type']) {
+				switch ($row['type']) {
 					case 'Innocent':
 					case 'HAM':
 						$color = 'rgba(0,255,0, %.1f)';
@@ -318,7 +316,7 @@ 
 			}
 			/* DMARC, DKIM, SPF format */
 			if (isset($row['result']))
-				switch($row['result']) {
+				switch ($row['result']) {
 					case 'pass':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -327,7 +325,7 @@ 
 				}
 			/* Spamassassin format */
 			if (isset($row['status']))
-	                        switch($row['status']) {
+	                        switch ($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -335,9 +333,9 @@ 
 						$color = 'rgba(255,0,0,%.1f)';
 				}	
 				
-			$alpha = (is_numeric($val)AND($key=='type')) ? round($val/100,1) : 1.0;
+			$alpha = (is_numeric($val) AND ($key == 'type')) ? round($val / 100, 1) : 1.0;
 			$bg = sprintf(" style=\"background-color: $color\"", $alpha);		
-			printf ('<td%s>%s</td>',$bg, $val);
+			printf('<td%s>%s</td>', $bg, $val);
 		}
 	}
 }

contrib/mailClassifier/list.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@ 
 <select name="folder" style="width:215px" onChange="xmlhttpPost('result.php', 'Classify', 'Result', '<img src=\'/include/pleasewait.gif\'>', true); return false;">
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'function.php');
 require_once($path.'config.php');
 require_once('function.php');
@@ -11,9 +11,9 @@ 
 openlog($tag, LOG_PID, $fac);
 
 $conf['imap']['user'] = username();
-$folders=imapFolder($conf['imap'], $_POST['username']);
+$folders = imapFolder($conf['imap'], $_POST['username']);
 print '<option  value="" selected disabled>Choose a folder</option>';
-foreach ( $folders as $folder )
+foreach ($folders as $folder)
         printf('<option  value="%s">%s</option>',
 		$folder,
 		htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP")));

contrib/mailClassifier/result.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 include_once($path.'config.php');
 require_once($path.'function.php');
 
@@ -14,14 +14,14 @@ 
 $tag .= $conf['syslog']['tag'];
 openlog($tag, LOG_PID, $fac);
 
-if ( $confimap['learn']=='dspamc' ) {
+if ($confimap['learn'] == 'dspamc') {
 	$cmd = escapeshellcmd('which dspamc');
 	$cmd = escapeshellcmd('which ls');
-	exec ( $cmd, $out, $ret );
+	exec($cmd, $out, $ret);
 	if ($ret != 0) {
 		$err = 'No DSPAM Client found on your system. Please, force your sysadmin to install "dspamc".';
 		syslog(LOG_ERR, $username.': Error: '.$err);
-		exit (sprintf('<p>%s</p>',htmlentities($err)));
+		exit (sprintf('<p>%s</p>', htmlentities($err)));
 	}
 }
 
@@ -60,10 +60,10 @@ 
 $headers = imapFind($confimap, $account, $folder);
 if (empty($headers)) exit (sprintf('<p>No suitable mail found in <b>%s</b> folder.</p>', htmlentities("<$folder>")));
 print '<table>';
-printTableHeader($folder,$data,TRUE,sprintf('Found %d suitable mails.',count($headers)));
+printTableHeader($folder, $data, TRUE, sprintf('Found %d suitable mails.', count($headers)));
 
-foreach ( $headers AS $header ) {
-	$values = imapInfo($header,$conf['host']['ar'],$confimap['dspamtospamass'],$confimap['learn']);
+foreach ($headers AS $header) {
+	$values = imapInfo($header, $conf['host']['ar'], $confimap['dspamtospamass'], $confimap['learn']);
 	print '<tr>';
 	printTableRow($values, $confimap['learn']);
 	print '</tr>';

contrib/mailClassifier/index.php

Spacing +6 added lines, -6 removed lines

@@ -10,24 +10,24 @@
 <body>
 <h1> Mail Classifier</h1> 
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'config.php');
 require_once($path.'function.php');
 require_once('function.php');
 
-if ( !isset($version) ) {
+if (!isset($version)) {
         openlog('mailClassifierEmergency', LOG_PID, LOG_LOCAL0);
-        syslog (LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__));
+        syslog(LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__));
         closelog();
         exit(255);
 }
 
 checkSSL();
 $user = username();
-$isAdmin = in_array($user,array_keys($admins));
+$isAdmin = in_array($user, array_keys($admins));
 $canChange = ($isAdmin) ? '' : 'readonly';
-if ( $require_auth )
-	if ( $user == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>");
+if ($require_auth)
+	if ($user == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>");
 
 
 print <<<END

contrib/mailClassifier/learn.php

Spacing +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <div id="content">
 <h3>Log</h3>
 <?php
-$path='/var/www/html/RBL/';
+$path = '/var/www/html/RBL/';
 require_once($path.'function.php');
 require_once($path.'config.php');
 $conf = parse_ini_file('imap.conf', TRUE);
@@ -16,17 +16,17 @@ 
 
 syslog(LOG_INFO, sprintf('%s: Learn as <%s> on signature: <%s>', $username, $par->class, $par->learn));
 $cmd = escapeshellcmd($_POST['cmd']);
-exec ( $cmd, $out, $ret );
+exec($cmd, $out, $ret);
 if ($ret != 0) {
 	$err = 'DSPAM Client returns a bad exit state. Sorry, probably the learn was successful, but I don\'t know...';
 	syslog(LOG_ERR, $username.': Learn Error: '.$err);	
-	exit (sprintf('<p>%s</p>',htmlentities($err)));
+	exit (sprintf('<p>%s</p>', htmlentities($err)));
 }
-syslog(LOG_INFO,'%s: Learn result: "%s"',$username, $out[0]);  
-if ( preg_match ('/^X-DSPAM-Result:\s+(?P<user>[\w\.\@]+);\s+result="(?P<result>\w+)";\s+class="(?P<class>\w+)";\s+probability=(?P<prob>[\d\.]+);\s+confidence=(?P<conf>[\d\.]+);\s+signature=(?P<sig>[\w\,]+)$/',$out[0],$received) != 1) {
+syslog(LOG_INFO, '%s: Learn result: "%s"', $username, $out[0]);  
+if (preg_match('/^X-DSPAM-Result:\s+(?P<user>[\w\.\@]+);\s+result="(?P<result>\w+)";\s+class="(?P<class>\w+)";\s+probability=(?P<prob>[\d\.]+);\s+confidence=(?P<conf>[\d\.]+);\s+signature=(?P<sig>[\w\,]+)$/', $out[0], $received) != 1) {
 		$err = 'DSPAM Client returned an unparseable result.';
 		syslog(LOG_ERR, $username.': Learn Error: '.$err);
-                exit (sprintf('<p>%s</p>',htmlentities($err)));
+                exit (sprintf('<p>%s</p>', htmlentities($err)));
 }
 
 printf('<p>Message learned successfully with following result:</p><ul><li>Owner: <b>%s</b></li><li>Result: <b>%s</b></li><li>Class: <b>%s</b></li></ul>',