falon / RBL

contrib/mailClassifier/function.php

Doc Comments +7 added lines

@@ -56,6 +56,10 @@ 
 	return $head;
 }
 
+/**
+ * @param null|string $prob
+ * @param null|string $conf
+ */
 function dspamLevel($prob, $conf) {
 /* Calculate DSPAM Level as the Spamassassin Plugin */
 	if (is_null($prob) or is_null($conf)) return '-';
@@ -63,6 +67,9 @@ 
 	return round(($t_prob + ($conf*100)) / 2);
 }
 
+/**
+ * @param string $classSpam
+ */
 function dspamType($classSpam) {
 	switch($classSpam) {
 		case 'HAM':

Indentation +85 added lines, -85 removed lines

@@ -3,13 +3,13 @@ 
 function imapFolder($cf, $username) {
 	$return = array();
 	$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);
+		$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);
 
 
-        syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...');
-        //get all folder
+		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))
@@ -23,7 +23,7 @@ 
 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());
+			or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error());
 	if ( !$m_mail ) exit(254);
 		
 
@@ -36,12 +36,12 @@ 
 	// 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");
+			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;
 	}
@@ -49,7 +49,7 @@ 
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
 	if ($nmes>0) rsort($m_search);
 
-        // loop for each message
+		// loop for each message
 	foreach ($m_search as $onem) 
 		$head[] = imap_fetchheader($m_mail, $onem );
 	imap_close($m_mail);
@@ -80,52 +80,52 @@ 
 /* Each line must end with /r/n         */
 
 	$result = array(
-                'date' => NULL,
-                'from' => NULL,
-                'messageid' => NULL,
+				'date' => NULL,
+				'from' => NULL,
+				'messageid' => NULL,
 		'dmarc' => array(
 			'result' => NULL,
 			'dom'	=> NULL
 			),
 		'spf' => array(
-                        'result' => NULL,
-                        'dom'   => NULL
-                        ),
+						'result' => NULL,
+						'dom'   => NULL
+						),
 		'dkim' => array(
-                        'result' => NULL,
-                        'dom'   => NULL
-                        ),
-                'spam' => array(
-                        'status' => NULL,
-                        'score' => NULL,
-                        'th'    => NULL,
-                        ),
-                'dspam' => array(
-                        'type' => NULL,
-                        'level' => NULL,
+						'result' => NULL,
+						'dom'   => NULL
+						),
+				'spam' => array(
+						'status' => NULL,
+						'score' => NULL,
+						'th'    => NULL,
+						),
+				'dspam' => array(
+						'type' => NULL,
+						'level' => NULL,
 			'learn' => NULL
-                        ),
+						),
 		'warn' => NULL
-        );
+		);
 		
 
-        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) ) {
+		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) {
+				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']['dom'] = $received['DMARCfrom'][$i];
 					$k++;
 				}
-                	}
+					}
+		}
 		}
-        }
 	$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) ) {
+		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) {
@@ -134,25 +134,25 @@ 
 					$result['spf']['result']=$received['spf'][$i];
 					$result['spf']['dom'] = $received['SPFfrom'][$i];
 					$k++;
-                        	}
-                	}
-        	}
+							}
+					}
+			}
 	}
 	$received=NULL;
 	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
 
 	$k=0;
-        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) ) {
+		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) ) {
 		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']['dom'] = $received['DKIMdom'][$i];
+					foreach ($ARhosts as $mx) {
+							if ($mx == $received['host'][$i]) {
+									/* This is a trusted AR result */
+									$result['dkim']['result']=$received['dkim'][$i];
+									$result['dkim']['dom'] = $received['DKIMdom'][$i];
 					$k++;
-                        	}
-                	}
-        	}
+							}
+					}
+			}
 	}
 	$received=NULL;
 	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
@@ -160,59 +160,59 @@ 
 	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];
-                	$result['spam']['score'] = $received['score'][0];
+					$result['spam']['score'] = $received['score'][0];
 			$result['spam']['th'] = $received['th'][0];
 			$result['dspam']['type'] = dspamType($received['dtype'][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.';
+			}
+			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];
-                        $result['spam']['score'] = $received['score'][0];
-                        $result['spam']['th'] = $received['th'][0];
+						$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.';
 		}
 		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['warn'] = 'DSPAM Result invalid, not present or present more than once.';
+			else
+					$result['dspam']['type']=$received['result'];
 		$prob = NULL;
 		$conf = NULL;
-                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.';
+				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)
-                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
+						$result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
 		else
 			$conf = $received['conf'];
 		$result['dspam']['level'] = dspamLevel($prob,$conf);
 	}
 	$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'];
+				$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)
-                $result['warn'][] = 'Date header invalid or not present';
+		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)
-                $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
+		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'];
 
-        $received=NULL;
+		$received=NULL;
 
-        switch ($learn) {
+		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'];			
@@ -223,23 +223,23 @@ 
 			syslog (LOG_INFO,$user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".');
 	}
 	
-        return $result;
+		return $result;
 }
 
 
 
 
 function printTableHeader($title,$content,$footer=FALSE,$fcontent) {
-        print <<<END
+		print <<<END
 	<caption>$title</caption>
 	<thead>
 	<tr>
 END;
 	$kcontent = array_keys($content);
-        $cols = count($kcontent);
-        for ($i=0; $i<$cols; $i++) {
+		$cols = count($kcontent);
+		for ($i=0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
-                printf ('<th colspan="%d" rowspan="%d">%s</th>',
+				printf ('<th colspan="%d" rowspan="%d">%s</th>',
 			!is_array($content[$key]) ?:
 			count(array_keys($content[$key])) ?: '1',
 			!is_array($content[$key]) ?:
@@ -255,13 +255,13 @@ 
 		}
 	}
 		
-        print '</tr></thead>';
-        if ($footer) {
-                print '<tfoot><tr>';
-                print "<th colspan=\"$cols\">".$fcontent.'</th>';
-                print '</tr></tfoot>';
-        }
-        return TRUE;
+		print '</tr></thead>';
+		if ($footer) {
+				print '<tfoot><tr>';
+				print "<th colspan=\"$cols\">".$fcontent.'</th>';
+				print '</tr></tfoot>';
+		}
+		return TRUE;
 }
 
 
@@ -336,7 +336,7 @@ 
 				}
 			/* Spamassassin format */
 			if (isset($row['status']))
-	                        switch($row['status']) {
+							switch($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;

Spacing +86 added lines, -88 removed lines

@@ -2,56 +2,56 @@ 
 
 function imapFolder($cf, $username) {
 	$return = array();
-	$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;
 }
@@ -59,12 +59,12 @@ 
 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 dspamType($classSpam) {
-	switch($classSpam) {
+	switch ($classSpam) {
 		case 'HAM':
 			return 'Innocent';
 		case 'SPAM':
@@ -75,7 +75,7 @@ 
 	}
 }
 
-function imapInfo($user,$header,$ARhosts,$dpl=false, $learn=false) {
+function imapInfo($user, $header, $ARhosts, $dpl = false, $learn = false) {
 /* Get relevant Info from header's mail */
 /* Each line must end with /r/n         */
 
@@ -109,118 +109,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.';
 
-	$k=0;
-        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) ) {
-		for ($i = count($received[0])-1;$i>=0;$i--) {
+	$k = 0;
+        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)) {
+		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'] = dspamType($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;
@@ -229,7 +229,7 @@ 
 
 
 
-function printTableHeader($title,$content,$footer=FALSE,$fcontent) {
+function printTableHeader($title, $content, $footer = FALSE, $fcontent) {
         print <<<END
 	<caption>$title</caption>
 	<thead>
@@ -237,21 +237,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);
 		}
 	}
 		
@@ -267,7 +265,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) {
@@ -275,7 +273,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);
@@ -297,26 +295,26 @@ 
 				$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;
 	}
 }
 
-function printTableRow($row, $learn, $init=true) {
+function printTableRow($row, $learn, $init = true) {
 	$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)';
@@ -327,7 +325,7 @@ 
 			}
 			/* DMARC, DKIM, SPF format */
 			if (isset($row['result']))
-				switch($row['result']) {
+				switch ($row['result']) {
 					case 'pass':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -336,7 +334,7 @@ 
 				}
 			/* Spamassassin format */
 			if (isset($row['status']))
-	                        switch($row['status']) {
+	                        switch ($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
 						break;
@@ -344,9 +342,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);
 		}
 	}
 }

Braces +106 added lines, -72 removed lines

@@ -5,18 +5,21 @@ 
 	$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);
+        if ( !$m_mail ) {
+        	exit(254);
+        }
 
 
         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)
+	if (is_array($list)) {
+			foreach ($list as $mbox)
 			$return[] = explode($open,$mbox,2)[1];
-	else
-		syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+	} else {
+			syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() );
+	}
 	return $return;
 }
 
@@ -24,7 +27,9 @@ 
 	$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);
+	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.'>...');
@@ -36,29 +41,36 @@ 
 	// 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 )
+	        if ( $ierr = imap_errors() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr");
-	        if ( $ierr = imap_alerts() )
-	                foreach ( $ierr as $thiserr )
+	        }
+	        if ( $ierr = imap_alerts() ) {
+	        	                foreach ( $ierr as $thiserr )
 	                        syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr");
+	        }
 		imap_close( $m_mail );
 		return FALSE;
 	}
 	$nmes = count ($m_search);
 	syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder.");
-	if ($nmes>0) rsort($m_search);
+	if ($nmes>0) {
+		rsort($m_search);
+	}
 
         // loop for each message
-	foreach ($m_search as $onem) 
-		$head[] = imap_fetchheader($m_mail, $onem );
+	foreach ($m_search as $onem) {
+			$head[] = imap_fetchheader($m_mail, $onem );
+	}
 	imap_close($m_mail);
 	return $head;
 }
 
 function dspamLevel($prob, $conf) {
 /* Calculate DSPAM Level as the Spamassassin Plugin */
-	if (is_null($prob) or is_null($conf)) return '-';
+	if (is_null($prob) or is_null($conf)) {
+		return '-';
+	}
 	$t_prob = abs((($prob - 0.5) * 2) * 100);
 	return round(($t_prob + ($conf*100)) / 2);
 }
@@ -123,7 +135,9 @@ 
 		}
         }
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.';
+	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;
@@ -139,7 +153,9 @@ 
         	}
 	}
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
+	if ($k>1) {
+		$result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.';
+	}
 
 	$k=0;
         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) ) {
@@ -155,7 +171,9 @@ 
         	}
 	}
 	$received=NULL;
-	if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.';
+	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) ) {
@@ -165,57 +183,66 @@ 
 			$result['dspam']['type'] = dspamType($received['dtype'][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 (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];
                         $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.';
+			if (count($received[0])>1) {
+							$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)
-	                $result['warn'] = 'DSPAM Result invalid, not present or present more than once.';
-	        else
-                	$result['dspam']['type']=$received['result'];
+		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'];
+	        }
 		$prob = NULL;
 		$conf = NULL;
-                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)
-                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
-		else
-			$conf = $received['conf'];
+                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) {
+		                        $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.';
+		} else {
+					$conf = $received['conf'];
+		}
 		$result['dspam']['level'] = dspamLevel($prob,$conf);
 	}
 	$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\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)
-                $result['warn'][] = 'Date header invalid or not present';
-	else
-		$result['date'] = $received['date'];
+        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)
-                $result['warn'][] = 'Message-ID invalid, not present or present more than once.';
-	else
-		$result['messageid']=$received['mid'];
+        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'];
+	}
 
         $received=NULL;
 
         switch ($learn) {
 		case 'dspamc':
-        		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'];			
+        		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'];
+			}
 			break;
 		case false:
 			break;
@@ -250,8 +277,9 @@ 
 	for ($i=0; $i<$cols; $i++) {
 		$key = $kcontent[$i];
 		if (is_array($content[$key])&&($hs = array_keys($content[$key]))) {
-			foreach ($hs as $h)
-				printf('<th>%s</th>',$h);
+			foreach ($hs as $h) {
+							printf('<th>%s</th>',$h);
+			}
 		}
 	}
 		
@@ -267,15 +295,16 @@ 
 
 function formatVal($val, $learn) {
 	foreach (array_keys($val) as $key) {
-		if (is_array($val["$key"]) and ($key!='warn'))
-			$val["$key"] = formatVal($val["$key"], $learn);
-		else {
+		if (is_array($val["$key"]) and ($key!='warn')) {
+					$val["$key"] = formatVal($val["$key"], $learn);
+		} else {
 			switch ($key) {
 				case 'warn':
-					if (empty($val["$key"]))
-						$val["$key"] = '-';
-					else 
-						$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+					if (empty($val["$key"])) {
+											$val["$key"] = '-';
+					} else {
+											$val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n"));
+					}
 					break;
 				case 'learn':
 					$val["$key"] = formLearn($learn, $val);
@@ -297,9 +326,10 @@ 
 				$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))
-					$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
+				if (($class != $par['type'])||($par['level']<99)) {
+									$return .= sprintf(file_get_contents('formLearnDSPAM.htm'),
 						$class,$class,$val["$class"],base64_encode(json_encode($par)),$class);
+				}
 			}
 		default:
 			return $return;
@@ -308,37 +338,41 @@ 
 
 function printTableRow($row, $learn, $init=true) {
 	$color = 'inherit';
-	if ($init) 
-		$row=formatVal($row,$learn);
+	if ($init) {
+			$row=formatVal($row,$learn);
+	}
 	foreach( $row as $key => $val) {
-		if (is_array($val))
-			printTableRow($val, $learn, false);
-		else {
+		if (is_array($val)) {
+					printTableRow($val, $learn, false);
+		} else {
 			/* DSPAM format */
-			if (isset($row['type']))
-				switch($row['type']) {
+			if (isset($row['type'])) {
+							switch($row['type']) {
 					case 'Innocent':
 					case 'HAM':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'Spam':
 					case 'SPAM':
 						$color = 'rgba(255,0,0,%.1f)';
 			}
 			/* DMARC, DKIM, SPF format */
-			if (isset($row['result']))
-				switch($row['result']) {
+			if (isset($row['result'])) {
+							switch($row['result']) {
 					case 'pass':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'fail':
 						$color = 'rgba(255,0,0,%.1f)';
 				}
 			/* Spamassassin format */
-			if (isset($row['status']))
-	                        switch($row['status']) {
+			if (isset($row['status'])) {
+				                        switch($row['status']) {
 					case 'No':
 						$color = 'rgba(0,255,0, %.1f)';
+			}
 						break;
 					case 'Yes':
 						$color = 'rgba(255,0,0,%.1f)';

contrib/mailClassifier/learn.php

Indentation +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
 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>',
 	htmlentities($received['user']),
-        $received['result'], $received['class']);
+		$received['result'], $received['class']);
 closelog();
 ?>
 </div>