@@ -2,56 +2,56 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | function imapFolder($cf, $username) { |
| 4 | 4 | $return = array(); |
| 5 | - $open='{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'; |
|
| 5 | + $open = '{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'; |
|
| 6 | 6 | $m_mail = imap_open($open, $username, $cf['authpassword'], OP_READONLY) |
| 7 | - or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error()); |
|
| 8 | - if ( !$m_mail ) exit(254); |
|
| 7 | + or syslog(LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: '.imap_last_error()); |
|
| 8 | + if (!$m_mail) exit(254); |
|
| 9 | 9 | |
| 10 | 10 | |
| 11 | - syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...'); |
|
| 11 | + syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].'>; Listing folders of account <'.$username.'>...'); |
|
| 12 | 12 | //get all folder |
| 13 | 13 | $list = imap_list($m_mail, $open, "*"); |
| 14 | 14 | imap_close($m_mail); |
| 15 | 15 | if (is_array($list)) |
| 16 | 16 | foreach ($list as $mbox) |
| 17 | - $return[] = explode($open,$mbox,2)[1]; |
|
| 17 | + $return[] = explode($open, $mbox, 2)[1]; |
|
| 18 | 18 | else |
| 19 | - syslog (LOG_INFO,$cf['user'] . ': imap_list failed: ' . imap_last_error() ); |
|
| 19 | + syslog(LOG_INFO, $cf['user'].': imap_list failed: '.imap_last_error()); |
|
| 20 | 20 | return $return; |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | -function imapFind ($cf, $username, $folder) { |
|
| 24 | - $head=array(); |
|
| 25 | - $m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username,$cf['authpassword'], OP_READONLY) |
|
| 26 | - or syslog (LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: ' . imap_last_error()); |
|
| 27 | - if ( !$m_mail ) exit(254); |
|
| 23 | +function imapFind($cf, $username, $folder) { |
|
| 24 | + $head = array(); |
|
| 25 | + $m_mail = imap_open('{'.$cf['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['authuser'].'}'.$folder, $username, $cf['authpassword'], OP_READONLY) |
|
| 26 | + or syslog(LOG_EMERG, $cf['user'].': Error in IMAP connection to <'.$cf['mailhost'].'>: '.imap_last_error()); |
|
| 27 | + if (!$m_mail) exit(254); |
|
| 28 | 28 | |
| 29 | 29 | |
| 30 | - syslog (LOG_INFO,$cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...'); |
|
| 30 | + syslog(LOG_INFO, $cf['user'].': Successfully connected to <'.$cf['mailhost'].">; Reading <$folder> messages of last ".$cf['oldestday'].' days on account <'.$username.'>...'); |
|
| 31 | 31 | //get all messages |
| 32 | - $dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['oldestday'].' days' ) ); |
|
| 33 | - $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \"" ); |
|
| 32 | + $dateTh = date("d-M-Y", strToTime('-'.$cf['oldestday'].' days')); |
|
| 33 | + $m_search = imap_search($m_mail, "SINCE \"$dateTh\" TEXT \"Authentication-Results: \""); |
|
| 34 | 34 | |
| 35 | 35 | |
| 36 | 36 | // Order results starting from newest message |
| 37 | - if ( empty($m_search) ) { |
|
| 38 | - syslog (LOG_INFO,$cf['user'].": No suitable mail found in <$folder> folder."); |
|
| 39 | - if ( $ierr = imap_errors() ) |
|
| 40 | - foreach ( $ierr as $thiserr ) |
|
| 41 | - syslog (LOG_ERR, $cf['user'].": IMAP Error: $thiserr"); |
|
| 42 | - if ( $ierr = imap_alerts() ) |
|
| 43 | - foreach ( $ierr as $thiserr ) |
|
| 44 | - syslog (LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr"); |
|
| 45 | - imap_close( $m_mail ); |
|
| 37 | + if (empty($m_search)) { |
|
| 38 | + syslog(LOG_INFO, $cf['user'].": No suitable mail found in <$folder> folder."); |
|
| 39 | + if ($ierr = imap_errors()) |
|
| 40 | + foreach ($ierr as $thiserr) |
|
| 41 | + syslog(LOG_ERR, $cf['user'].": IMAP Error: $thiserr"); |
|
| 42 | + if ($ierr = imap_alerts()) |
|
| 43 | + foreach ($ierr as $thiserr) |
|
| 44 | + syslog(LOG_ALERT, $cf['user'].": IMAP Alert: $thiserr"); |
|
| 45 | + imap_close($m_mail); |
|
| 46 | 46 | return FALSE; |
| 47 | 47 | } |
| 48 | - $nmes = count ($m_search); |
|
| 49 | - syslog (LOG_INFO,$cf['user'].": Found $nmes mail in <$folder> folder."); |
|
| 48 | + $nmes = count($m_search); |
|
| 49 | + syslog(LOG_INFO, $cf['user'].": Found $nmes mail in <$folder> folder."); |
|
| 50 | 50 | if ($nmes>0) rsort($m_search); |
| 51 | 51 | |
| 52 | 52 | // loop for each message |
| 53 | 53 | foreach ($m_search as $onem) |
| 54 | - $head[] = imap_fetchheader($m_mail, $onem ); |
|
| 54 | + $head[] = imap_fetchheader($m_mail, $onem); |
|
| 55 | 55 | imap_close($m_mail); |
| 56 | 56 | return $head; |
| 57 | 57 | } |
@@ -59,12 +59,12 @@ discard block |
||
| 59 | 59 | function dspamLevel($prob, $conf) { |
| 60 | 60 | /* Calculate DSPAM Level as the Spamassassin Plugin */ |
| 61 | 61 | if (is_null($prob) or is_null($conf)) return '-'; |
| 62 | - $t_prob = abs((($prob - 0.5) * 2) * 100); |
|
| 63 | - return round(($t_prob + ($conf*100)) / 2); |
|
| 62 | + $t_prob = abs((($prob-0.5) * 2) * 100); |
|
| 63 | + return round(($t_prob+($conf * 100)) / 2); |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | function dspamType($classSpam) { |
| 67 | - switch($classSpam) { |
|
| 67 | + switch ($classSpam) { |
|
| 68 | 68 | case 'HAM': |
| 69 | 69 | return 'Innocent'; |
| 70 | 70 | case 'SPAM': |
@@ -75,7 +75,7 @@ discard block |
||
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | |
| 78 | -function imapInfo($user,$header,$ARhosts,$dpl=false, $learn=false) { |
|
| 78 | +function imapInfo($user, $header, $ARhosts, $dpl = false, $learn = false) { |
|
| 79 | 79 | /* Get relevant Info from header's mail */ |
| 80 | 80 | /* Each line must end with /r/n */ |
| 81 | 81 | |
@@ -109,118 +109,118 @@ discard block |
||
| 109 | 109 | ); |
| 110 | 110 | |
| 111 | 111 | |
| 112 | - 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) ) { |
|
| 113 | - $k=0; |
|
| 114 | - for ($i = count($received[0])-1;$i>=0;$i--) { |
|
| 112 | + 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)) { |
|
| 113 | + $k = 0; |
|
| 114 | + for ($i = count($received[0])-1; $i>=0; $i--) { |
|
| 115 | 115 | foreach ($ARhosts as $mx) { |
| 116 | 116 | if ($mx == $received['host'][$i]) { |
| 117 | 117 | /* This is a trusted AR result */ |
| 118 | - $result['dmarc']['result']=$received['dmarc'][$i]; |
|
| 118 | + $result['dmarc']['result'] = $received['dmarc'][$i]; |
|
| 119 | 119 | $result['dmarc']['dom'] = $received['DMARCfrom'][$i]; |
| 120 | 120 | $k++; |
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | } |
| 125 | - $received=NULL; |
|
| 125 | + $received = NULL; |
|
| 126 | 126 | if ($k>1) $result['warn'][] = 'The trusted DMARC AR Headers are present more than once. Something wrong.'; |
| 127 | 127 | |
| 128 | - 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) ) { |
|
| 129 | - $k=0; |
|
| 130 | - for ($i = count($received[0])-1;$i>=0;$i--) { |
|
| 128 | + 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)) { |
|
| 129 | + $k = 0; |
|
| 130 | + for ($i = count($received[0])-1; $i>=0; $i--) { |
|
| 131 | 131 | foreach ($ARhosts as $mx) { |
| 132 | 132 | if ($mx == $received['host'][$i]) { |
| 133 | 133 | /* This is a trusted AR result */ |
| 134 | - $result['spf']['result']=$received['spf'][$i]; |
|
| 134 | + $result['spf']['result'] = $received['spf'][$i]; |
|
| 135 | 135 | $result['spf']['dom'] = $received['SPFfrom'][$i]; |
| 136 | 136 | $k++; |
| 137 | 137 | } |
| 138 | 138 | } |
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | - $received=NULL; |
|
| 141 | + $received = NULL; |
|
| 142 | 142 | if ($k>1) $result['warn'][] = 'The trusted SPF AR Headers are present more than once. Something wrong.'; |
| 143 | 143 | |
| 144 | - $k=0; |
|
| 145 | - 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) ) { |
|
| 146 | - for ($i = count($received[0])-1;$i>=0;$i--) { |
|
| 144 | + $k = 0; |
|
| 145 | + 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)) { |
|
| 146 | + for ($i = count($received[0])-1; $i>=0; $i--) { |
|
| 147 | 147 | foreach ($ARhosts as $mx) { |
| 148 | 148 | if ($mx == $received['host'][$i]) { |
| 149 | 149 | /* This is a trusted AR result */ |
| 150 | - $result['dkim']['result']=$received['dkim'][$i]; |
|
| 150 | + $result['dkim']['result'] = $received['dkim'][$i]; |
|
| 151 | 151 | $result['dkim']['dom'] = $received['DKIMdom'][$i]; |
| 152 | 152 | $k++; |
| 153 | 153 | } |
| 154 | 154 | } |
| 155 | 155 | } |
| 156 | 156 | } |
| 157 | - $received=NULL; |
|
| 157 | + $received = NULL; |
|
| 158 | 158 | if ($k>1) $result['warn'][] = 'The trusted DKIM AR Headers are present more than once. Something wrong.'; |
| 159 | 159 | |
| 160 | 160 | if ($dpl) { /* Use Spamassassin Plugin */ |
| 161 | - 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) ) { |
|
| 162 | - $result['spam']['status']=$received['spamstatus'][0]; |
|
| 161 | + 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)) { |
|
| 162 | + $result['spam']['status'] = $received['spamstatus'][0]; |
|
| 163 | 163 | $result['spam']['score'] = $received['score'][0]; |
| 164 | 164 | $result['spam']['th'] = $received['th'][0]; |
| 165 | 165 | $result['dspam']['type'] = dspamType($received['dtype'][0]); |
| 166 | - $result['dspam']['level'] =$received['dlevel'][0]; |
|
| 166 | + $result['dspam']['level'] = $received['dlevel'][0]; |
|
| 167 | 167 | } |
| 168 | 168 | if (count($received[0])>1) $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.'; |
| 169 | 169 | } |
| 170 | 170 | else { /* Parse apart all DSPAM Header and calculate a level */ |
| 171 | - 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) ) { |
|
| 172 | - $result['spam']['status']=$received['spamstatus'][0]; |
|
| 171 | + 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)) { |
|
| 172 | + $result['spam']['status'] = $received['spamstatus'][0]; |
|
| 173 | 173 | $result['spam']['score'] = $received['score'][0]; |
| 174 | 174 | $result['spam']['th'] = $received['th'][0]; |
| 175 | 175 | if (count($received[0])>1) |
| 176 | - $result['warn'][]= 'The Spamassassin Headers are present more than once. I consider only the last one.'; |
|
| 176 | + $result['warn'][] = 'The Spamassassin Headers are present more than once. I consider only the last one.'; |
|
| 177 | 177 | } |
| 178 | - if ( preg_match ('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/',$header,$received) != 1) |
|
| 178 | + if (preg_match('/\r\nX\-DSPAM\-Result:\s(?P<result>.*)\r\n/', $header, $received) != 1) |
|
| 179 | 179 | $result['warn'] = 'DSPAM Result invalid, not present or present more than once.'; |
| 180 | 180 | else |
| 181 | - $result['dspam']['type']=$received['result']; |
|
| 181 | + $result['dspam']['type'] = $received['result']; |
|
| 182 | 182 | $prob = NULL; |
| 183 | 183 | $conf = NULL; |
| 184 | - if ( preg_match ('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/',$header,$received) != 1) |
|
| 184 | + if (preg_match('/\r\nX\-DSPAM\-Probability:\s(?P<prob>.*)\r\n/', $header, $received) != 1) |
|
| 185 | 185 | $result['warn'][] = 'DSPAM Probability invalid, not present or present more than once.'; |
| 186 | 186 | else |
| 187 | 187 | $prob = $received['prob']; |
| 188 | - if ( preg_match ('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/',$header,$received) != 1) |
|
| 188 | + if (preg_match('/\r\nX\-DSPAM\-Confidence:\s(?P<conf>.*)\r\n/', $header, $received) != 1) |
|
| 189 | 189 | $result['warn'][] = 'DSPAM Confidence invalid, not present or present more than once.'; |
| 190 | 190 | else |
| 191 | 191 | $conf = $received['conf']; |
| 192 | - $result['dspam']['level'] = dspamLevel($prob,$conf); |
|
| 192 | + $result['dspam']['level'] = dspamLevel($prob, $conf); |
|
| 193 | 193 | } |
| 194 | - $received=NULL; |
|
| 195 | - if ( preg_match ('/\r\nFrom:\s(?P<from>.*)\r\n/',$header,$received) != 1) |
|
| 194 | + $received = NULL; |
|
| 195 | + if (preg_match('/\r\nFrom:\s(?P<from>.*)\r\n/', $header, $received) != 1) |
|
| 196 | 196 | $result['warn'][] = 'From header invalid or not present'; |
| 197 | 197 | else |
| 198 | 198 | $result['from'] = $received['from']; |
| 199 | 199 | |
| 200 | - if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$received) != 1) |
|
| 200 | + if (preg_match('/\r\nDate:\s(?P<date>.*)\r\n/', $header, $received) != 1) |
|
| 201 | 201 | $result['warn'][] = 'Date header invalid or not present'; |
| 202 | 202 | else |
| 203 | 203 | $result['date'] = $received['date']; |
| 204 | 204 | |
| 205 | - $received=NULL; |
|
| 206 | - if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$received) != 1) |
|
| 205 | + $received = NULL; |
|
| 206 | + if (preg_match('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/', $header, $received) != 1) |
|
| 207 | 207 | $result['warn'][] = 'Message-ID invalid, not present or present more than once.'; |
| 208 | 208 | else |
| 209 | - $result['messageid']=$received['mid']; |
|
| 209 | + $result['messageid'] = $received['mid']; |
|
| 210 | 210 | |
| 211 | - $received=NULL; |
|
| 211 | + $received = NULL; |
|
| 212 | 212 | |
| 213 | 213 | switch ($learn) { |
| 214 | 214 | case 'dspamc': |
| 215 | - if ( preg_match ('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/',$header,$received) != 1) |
|
| 215 | + if (preg_match('/\r\nX\-DSPAM\-Signature:\s(?P<sig>.*)\r\n/', $header, $received) != 1) |
|
| 216 | 216 | $result['warn'] = 'DSPAM Signature invalid, not present or present more than once.'; |
| 217 | 217 | else |
| 218 | - $result['dspam']['learn']=$received['sig']; |
|
| 218 | + $result['dspam']['learn'] = $received['sig']; |
|
| 219 | 219 | break; |
| 220 | 220 | case false: |
| 221 | 221 | break; |
| 222 | 222 | default: |
| 223 | - syslog (LOG_INFO,$user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".'); |
|
| 223 | + syslog(LOG_INFO, $user.': Error in "learn" imap configuration value. Please, set "dspamc" or "false".'); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | return $result; |
@@ -229,7 +229,7 @@ discard block |
||
| 229 | 229 | |
| 230 | 230 | |
| 231 | 231 | |
| 232 | -function printTableHeader($title,$content,$footer=FALSE,$fcontent) { |
|
| 232 | +function printTableHeader($title, $content, $footer = FALSE, $fcontent) { |
|
| 233 | 233 | print <<<END |
| 234 | 234 | <caption>$title</caption> |
| 235 | 235 | <thead> |
@@ -237,21 +237,19 @@ discard block |
||
| 237 | 237 | END; |
| 238 | 238 | $kcontent = array_keys($content); |
| 239 | 239 | $cols = count($kcontent); |
| 240 | - for ($i=0; $i<$cols; $i++) { |
|
| 240 | + for ($i = 0; $i<$cols; $i++) { |
|
| 241 | 241 | $key = $kcontent[$i]; |
| 242 | - printf ('<th colspan="%d" rowspan="%d">%s</th>', |
|
| 243 | - !is_array($content[$key]) ?: |
|
| 244 | - count(array_keys($content[$key])) ?: '1', |
|
| 245 | - !is_array($content[$key]) ?: |
|
| 246 | - empty(array_keys($content[$key])) ? '2' : '1', |
|
| 242 | + printf('<th colspan="%d" rowspan="%d">%s</th>', |
|
| 243 | + !is_array($content[$key]) ?: count(array_keys($content[$key])) ?: '1', |
|
| 244 | + !is_array($content[$key]) ?: empty(array_keys($content[$key])) ? '2' : '1', |
|
| 247 | 245 | $kcontent[$i]); |
| 248 | 246 | } |
| 249 | 247 | print '</tr><tr>'; |
| 250 | - for ($i=0; $i<$cols; $i++) { |
|
| 248 | + for ($i = 0; $i<$cols; $i++) { |
|
| 251 | 249 | $key = $kcontent[$i]; |
| 252 | - if (is_array($content[$key])&&($hs = array_keys($content[$key]))) { |
|
| 250 | + if (is_array($content[$key]) && ($hs = array_keys($content[$key]))) { |
|
| 253 | 251 | foreach ($hs as $h) |
| 254 | - printf('<th>%s</th>',$h); |
|
| 252 | + printf('<th>%s</th>', $h); |
|
| 255 | 253 | } |
| 256 | 254 | } |
| 257 | 255 | |
@@ -267,7 +265,7 @@ discard block |
||
| 267 | 265 | |
| 268 | 266 | function formatVal($val, $learn) { |
| 269 | 267 | foreach (array_keys($val) as $key) { |
| 270 | - if (is_array($val["$key"]) and ($key!='warn')) |
|
| 268 | + if (is_array($val["$key"]) and ($key != 'warn')) |
|
| 271 | 269 | $val["$key"] = formatVal($val["$key"], $learn); |
| 272 | 270 | else { |
| 273 | 271 | switch ($key) { |
@@ -275,7 +273,7 @@ discard block |
||
| 275 | 273 | if (empty($val["$key"])) |
| 276 | 274 | $val["$key"] = '-'; |
| 277 | 275 | else |
| 278 | - $val["$key"] = sprintf('<div title="%s">Y</div>',implode($val["$key"],"\n")); |
|
| 276 | + $val["$key"] = sprintf('<div title="%s">Y</div>', implode($val["$key"], "\n")); |
|
| 279 | 277 | break; |
| 280 | 278 | case 'learn': |
| 281 | 279 | $val["$key"] = formLearn($learn, $val); |
@@ -297,26 +295,26 @@ discard block |
||
| 297 | 295 | $par['class'] = $class; |
| 298 | 296 | $val["$class"] = sprintf('dspamc --user dspam --deliver=summary --class=%s --source=error --signature=%s', |
| 299 | 297 | strtolower($class), $par['learn']); |
| 300 | - if (($class != $par['type'])||($par['level']<99)) |
|
| 298 | + if (($class != $par['type']) || ($par['level']<99)) |
|
| 301 | 299 | $return .= sprintf(file_get_contents('formLearnDSPAM.htm'), |
| 302 | - $class,$class,$val["$class"],base64_encode(json_encode($par)),$class); |
|
| 300 | + $class, $class, $val["$class"], base64_encode(json_encode($par)), $class); |
|
| 303 | 301 | } |
| 304 | 302 | default: |
| 305 | 303 | return $return; |
| 306 | 304 | } |
| 307 | 305 | } |
| 308 | 306 | |
| 309 | -function printTableRow($row, $learn, $init=true) { |
|
| 307 | +function printTableRow($row, $learn, $init = true) { |
|
| 310 | 308 | $color = 'inherit'; |
| 311 | 309 | if ($init) |
| 312 | - $row=formatVal($row,$learn); |
|
| 313 | - foreach( $row as $key => $val) { |
|
| 310 | + $row = formatVal($row, $learn); |
|
| 311 | + foreach ($row as $key => $val) { |
|
| 314 | 312 | if (is_array($val)) |
| 315 | 313 | printTableRow($val, $learn, false); |
| 316 | 314 | else { |
| 317 | 315 | /* DSPAM format */ |
| 318 | 316 | if (isset($row['type'])) |
| 319 | - switch($row['type']) { |
|
| 317 | + switch ($row['type']) { |
|
| 320 | 318 | case 'Innocent': |
| 321 | 319 | case 'HAM': |
| 322 | 320 | $color = 'rgba(0,255,0, %.1f)'; |
@@ -327,7 +325,7 @@ discard block |
||
| 327 | 325 | } |
| 328 | 326 | /* DMARC, DKIM, SPF format */ |
| 329 | 327 | if (isset($row['result'])) |
| 330 | - switch($row['result']) { |
|
| 328 | + switch ($row['result']) { |
|
| 331 | 329 | case 'pass': |
| 332 | 330 | $color = 'rgba(0,255,0, %.1f)'; |
| 333 | 331 | break; |
@@ -336,7 +334,7 @@ discard block |
||
| 336 | 334 | } |
| 337 | 335 | /* Spamassassin format */ |
| 338 | 336 | if (isset($row['status'])) |
| 339 | - switch($row['status']) { |
|
| 337 | + switch ($row['status']) { |
|
| 340 | 338 | case 'No': |
| 341 | 339 | $color = 'rgba(0,255,0, %.1f)'; |
| 342 | 340 | break; |
@@ -344,9 +342,9 @@ discard block |
||
| 344 | 342 | $color = 'rgba(255,0,0,%.1f)'; |
| 345 | 343 | } |
| 346 | 344 | |
| 347 | - $alpha = (is_numeric($val)AND($key=='type')) ? round($val/100,1) : 1.0; |
|
| 345 | + $alpha = (is_numeric($val) AND ($key == 'type')) ? round($val / 100, 1) : 1.0; |
|
| 348 | 346 | $bg = sprintf(" style=\"background-color: $color\"", $alpha); |
| 349 | - printf ('<td class="cellfix"%s>%s</td>',$bg, $val); |
|
| 347 | + printf('<td class="cellfix"%s>%s</td>', $bg, $val); |
|
| 350 | 348 | } |
| 351 | 349 | } |
| 352 | 350 | } |