falon /
RBL
@@ -14,11 +14,11 @@ discard block |
||
| 14 | 14 | require_once('function.php'); |
| 15 | 15 | |
| 16 | 16 | checkSSL(); |
| 17 | -if ( $require_auth ) |
|
| 18 | - if ( username() == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>"); |
|
| 17 | +if ($require_auth) |
|
| 18 | + if (username() == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>"); |
|
| 19 | 19 | |
| 20 | 20 | |
| 21 | -if ( $imapListActive ) |
|
| 21 | +if ($imapListActive) |
|
| 22 | 22 | print ' <p style="text-align: right"><a href="/spamreport" target="_new">SPAM Learn Observer</a></p>'; |
| 23 | 23 | |
| 24 | 24 | print <<<END |
@@ -27,10 +27,10 @@ discard block |
||
| 27 | 27 | END; |
| 28 | 28 | |
| 29 | 29 | |
| 30 | -$option=NULL; |
|
| 30 | +$option = NULL; |
|
| 31 | 31 | $desc = array_keys($tables); |
| 32 | 32 | foreach ($desc as $description) { |
| 33 | - $disabled = $tables["$description"]['active']==TRUE ? '' : ' disabled'; |
|
| 33 | + $disabled = $tables["$description"]['active'] == TRUE ? '' : ' disabled'; |
|
| 34 | 34 | $option .= '<option value="'.$description."\"$disabled>$description</option>"; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -10,24 +10,24 @@ |
||
| 10 | 10 | <body> |
| 11 | 11 | <h1> Mail Classifier</h1> |
| 12 | 12 | <?php |
| 13 | -$path='/var/www/html/RBL/'; |
|
| 13 | +$path = '/var/www/html/RBL/'; |
|
| 14 | 14 | require_once($path.'config.php'); |
| 15 | 15 | require_once($path.'function.php'); |
| 16 | 16 | require_once('function.php'); |
| 17 | 17 | |
| 18 | -if ( !isset($version) ) { |
|
| 18 | +if (!isset($version)) { |
|
| 19 | 19 | openlog('mailClassifierEmergency', LOG_PID, LOG_LOCAL0); |
| 20 | - syslog (LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__)); |
|
| 20 | + syslog(LOG_EMERG, sprintf('unknown: I can\'t read the config files. Do you have configured the $path in %s?', __FILE__)); |
|
| 21 | 21 | closelog(); |
| 22 | 22 | exit(255); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | 25 | checkSSL(); |
| 26 | 26 | $user = username(); |
| 27 | -$isAdmin = in_array($user,array_keys($admins)); |
|
| 27 | +$isAdmin = in_array($user, array_keys($admins)); |
|
| 28 | 28 | $canChange = ($isAdmin) ? '' : 'readonly'; |
| 29 | -if ( $require_auth ) |
|
| 30 | - if ( $user == 'unknown' ) exit ("<p>You MUST configure your server to use authentication.</p>"); |
|
| 29 | +if ($require_auth) |
|
| 30 | + if ($user == 'unknown') exit ("<p>You MUST configure your server to use authentication.</p>"); |
|
| 31 | 31 | |
| 32 | 32 | |
| 33 | 33 | print <<<END |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -$path='/var/www/html/RBL/'; |
|
| 2 | +$path = '/var/www/html/RBL/'; |
|
| 3 | 3 | include_once($path.'config.php'); |
| 4 | 4 | require_once($path.'function.php'); |
| 5 | 5 | |
@@ -14,14 +14,14 @@ discard block |
||
| 14 | 14 | $tag .= $conf['syslog']['tag']; |
| 15 | 15 | openlog($tag, LOG_PID, $fac); |
| 16 | 16 | |
| 17 | -if ( $confimap['learn']=='dspamc' ) { |
|
| 17 | +if ($confimap['learn'] == 'dspamc') { |
|
| 18 | 18 | $cmd = escapeshellcmd('which dspamc'); |
| 19 | 19 | $cmd = escapeshellcmd('which ls'); |
| 20 | - exec ( $cmd, $out, $ret ); |
|
| 20 | + exec($cmd, $out, $ret); |
|
| 21 | 21 | if ($ret != 0) { |
| 22 | 22 | $err = 'No DSPAM Client found on your system. Please, force your sysadmin to install "dspamc".'; |
| 23 | 23 | syslog(LOG_ERR, $username.': Error: '.$err); |
| 24 | - exit (sprintf('<p>%s</p>',htmlentities($err))); |
|
| 24 | + exit (sprintf('<p>%s</p>', htmlentities($err))); |
|
| 25 | 25 | } |
| 26 | 26 | } |
| 27 | 27 | |
@@ -60,10 +60,10 @@ discard block |
||
| 60 | 60 | $headers = imapFind($confimap, $account, $folder); |
| 61 | 61 | if (empty($headers)) exit (sprintf('<p>No suitable mail found in <b>%s</b> folder.</p>', htmlentities("<$folder>"))); |
| 62 | 62 | print '<table>'; |
| 63 | -printTableHeader($folder,$data,TRUE,sprintf('Found %d suitable mails.',count($headers))); |
|
| 63 | +printTableHeader($folder, $data, TRUE, sprintf('Found %d suitable mails.', count($headers))); |
|
| 64 | 64 | |
| 65 | -foreach ( $headers AS $header ) { |
|
| 66 | - $values = imapInfo($username, $header,$conf['host']['ar'],$confimap['dspamtospamass'],$confimap['learn']); |
|
| 65 | +foreach ($headers AS $header) { |
|
| 66 | + $values = imapInfo($username, $header, $conf['host']['ar'], $confimap['dspamtospamass'], $confimap['learn']); |
|
| 67 | 67 | print '<tr>'; |
| 68 | 68 | printTableRow($values, $confimap['learn']); |
| 69 | 69 | print '</tr>'; |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <select name="folder" style="width:215px" onChange="xmlhttpPost('result.php', 'Classify', 'Result', '<img src=\'/include/pleasewait.gif\'>', true); return false;"> |
| 2 | 2 | <?php |
| 3 | -$path='/var/www/html/RBL/'; |
|
| 3 | +$path = '/var/www/html/RBL/'; |
|
| 4 | 4 | require_once($path.'function.php'); |
| 5 | 5 | require_once($path.'config.php'); |
| 6 | 6 | require_once('function.php'); |
@@ -11,10 +11,10 @@ discard block |
||
| 11 | 11 | openlog($tag, LOG_PID, $fac); |
| 12 | 12 | |
| 13 | 13 | $conf['imap']['user'] = username(); |
| 14 | -$folders=imapFolder($conf['imap'], $_POST['username']); |
|
| 14 | +$folders = imapFolder($conf['imap'], $_POST['username']); |
|
| 15 | 15 | if (is_array($folders)) { |
| 16 | 16 | print '<option value="" selected disabled>Choose a folder</option>'; |
| 17 | - foreach ( $folders as $folder ) |
|
| 17 | + foreach ($folders as $folder) |
|
| 18 | 18 | printf('<option value="%s">%s</option>', |
| 19 | 19 | $folder, |
| 20 | 20 | htmlspecialchars(mb_convert_encoding($folder, "UTF-8", "UTF7-IMAP"))); |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <div id="content"> |
| 2 | 2 | <h3>Log</h3> |
| 3 | 3 | <?php |
| 4 | -$path='/var/www/html/RBL/'; |
|
| 4 | +$path = '/var/www/html/RBL/'; |
|
| 5 | 5 | require_once($path.'function.php'); |
| 6 | 6 | require_once($path.'config.php'); |
| 7 | 7 | $conf = parse_ini_file('imap.conf', TRUE); |
@@ -16,17 +16,17 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | syslog(LOG_INFO, sprintf('%s: Learn as <%s> on signature: <%s>', $username, $par->class, $par->learn)); |
| 18 | 18 | $cmd = escapeshellcmd($_POST['cmd']); |
| 19 | -exec ( $cmd, $out, $ret ); |
|
| 19 | +exec($cmd, $out, $ret); |
|
| 20 | 20 | if ($ret != 0) { |
| 21 | 21 | $err = 'DSPAM Client returns a bad exit state. Sorry, probably the learn was successful, but I don\'t know...'; |
| 22 | 22 | syslog(LOG_ERR, $username.': Learn Error: '.$err); |
| 23 | - exit (sprintf('<p>%s</p>',htmlentities($err))); |
|
| 23 | + exit (sprintf('<p>%s</p>', htmlentities($err))); |
|
| 24 | 24 | } |
| 25 | -syslog(LOG_INFO, sprintf('%s: Learn result: "%s"',$username, $out[0])); |
|
| 26 | -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) { |
|
| 25 | +syslog(LOG_INFO, sprintf('%s: Learn result: "%s"', $username, $out[0])); |
|
| 26 | +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) { |
|
| 27 | 27 | $err = 'DSPAM Client returned an unparseable result.'; |
| 28 | 28 | syslog(LOG_ERR, $username.': Learn Error: '.$err); |
| 29 | - exit (sprintf('<p>%s</p>',htmlentities($err))); |
|
| 29 | + exit (sprintf('<p>%s</p>', htmlentities($err))); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | 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>', |
@@ -1,14 +1,14 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -if (in_array($user,array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>'; |
|
| 2 | +if (in_array($user, array_keys(array_filter($adm)))) $extopt = '<option value="MONTH">MONTHS</option><option value="YEAR">YEARS</option>'; |
|
| 3 | 3 | else $extopt = NULL; |
| 4 | 4 | |
| 5 | -if ( $tables["$typedesc"]['milter'] ) { |
|
| 6 | - if ( checkMilterConf($tables["$typedesc"]) ) |
|
| 5 | +if ($tables["$typedesc"]['milter']) { |
|
| 6 | + if (checkMilterConf($tables["$typedesc"])) |
|
| 7 | 7 | print '<p>This is a milter table. Please, first add your item as usual. Then you will be able to customize the milter settings.</p>'; |
| 8 | 8 | else { |
| 9 | 9 | $err = "Error in config about <$typedesc>. Check at your config.php."; |
| 10 | - syslog (LOG_EMERG, $err); |
|
| 11 | - printf ('<p>%s</p>', htmlspecialchars($err) ); |
|
| 10 | + syslog(LOG_EMERG, $err); |
|
| 11 | + printf('<p>%s</p>', htmlspecialchars($err)); |
|
| 12 | 12 | } |
| 13 | 13 | } |
| 14 | 14 | |
@@ -16,4 +16,4 @@ discard block |
||
| 16 | 16 | <form style="margin:0; text-align: left;" name='ListButton<?php echo $type ?>' enctype="text/plain" method="post" target="_self" action="list.php" onSubmit="xmlhttpPost('list.php', 'ListButton<?php echo $type ?>', 'Risultato', '<img src=\'/include/pleasewait.gif\'>'); return false;" /> |
| 17 | 17 | |
| 18 | 18 | List <?php echo $typedesc.' <'.$value.'>'; ?> for <input name="type" type="hidden" value="<?php echo $typedesc; ?>" /><input name="value" type="hidden" class="input_text" value="<?php echo $value; ?>" /> |
| 19 | - <select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt;?></select> Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form> |
|
| 19 | + <select name="quantity" class="input_text" size="1"><option value="1">1</option><option value="2">2</option><option value="3">3</option><option value="4">4</option><option value="5">5</option><option value="6">6</option><option value="20">20</option></select><select class="input_text" name="unit" size="1"><option value="DAY">DAYS</option><option value="WEEK">WEEKS</option><?php echo $extopt; ?></select> Reason:<input maxlength="128" name="reason" size="30" type="text" class="input_text" /><input name="List" class="button" id="bwarn" type="submit" value="List"/></form> |
|
@@ -5,20 +5,20 @@ discard block |
||
| 5 | 5 | $net = new \dautkom\ipv4\IPv4(); |
| 6 | 6 | |
| 7 | 7 | $_ = $_POST['genere']; |
| 8 | -if ( ($tables["$_"]['field']=='email') AND ($_POST['Value']!='ALL') ) |
|
| 8 | +if (($tables["$_"]['field'] == 'email') AND ($_POST['Value'] != 'ALL')) |
|
| 9 | 9 | if (!(filter_var($_POST['Value'], FILTER_VALIDATE_EMAIL))) |
| 10 | 10 | exit ('<pre><'.$_POST['Value'].'> is NOT a valid email address.</pre>'); |
| 11 | 11 | |
| 12 | -if ( ($tables["$_"]['field']=='domain') AND ($_POST['Value']!='ALL') ) |
|
| 12 | +if (($tables["$_"]['field'] == 'domain') AND ($_POST['Value'] != 'ALL')) |
|
| 13 | 13 | if (!(isValid($_POST['Value']))) |
| 14 | 14 | exit ('<pre><'.$_POST['Value'].'> is NOT a valid domain.</pre>'); |
| 15 | 15 | |
| 16 | -if ( ($tables["$_"]['field']=='ip') AND ($_POST['Value']!='ALL') ) |
|
| 16 | +if (($tables["$_"]['field'] == 'ip') AND ($_POST['Value'] != 'ALL')) |
|
| 17 | 17 | if (!(filter_var($_POST['Value'], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))) |
| 18 | 18 | exit ('<pre><'.$_POST['Value'].'> is NOT a valid IP address.</pre>'); |
| 19 | 19 | |
| 20 | -if ( ($tables["$_"]['field']=='network') AND ($_POST['Value']!='ALL') ) { |
|
| 21 | - $value = explode('/',$_POST['Value']); |
|
| 20 | +if (($tables["$_"]['field'] == 'network') AND ($_POST['Value'] != 'ALL')) { |
|
| 21 | + $value = explode('/', $_POST['Value']); |
|
| 22 | 22 | if (count($value) != 2) |
| 23 | 23 | exit ('<pre><'.$_POST['Value'].'> is NOT a valid Network/Netmask pair.</pre>'); |
| 24 | 24 | if (!$net->address($value[0])->mask($value[1])->isValid(1)) |
@@ -26,16 +26,16 @@ discard block |
||
| 26 | 26 | $_POST['Value'] = $value[0].'/'.$net->mask($value[1])->convertTo('dec'); |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | -if ( ($tables["$_"]['field']=='username') AND ($_POST['Value']!='ALL') ) { |
|
| 30 | - if ( preg_match( '/[^\x20-\x7f]/', $_POST['Value']) ) |
|
| 29 | +if (($tables["$_"]['field'] == 'username') AND ($_POST['Value'] != 'ALL')) { |
|
| 30 | + if (preg_match('/[^\x20-\x7f]/', $_POST['Value'])) |
|
| 31 | 31 | exit('<pre><'.$_POST['Value'].'> contains NON ASCII chars.</pre>'); |
| 32 | - if ( preg_match( '/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value']) ) |
|
| 32 | + if (preg_match('/[$~=#*+%,{}()\/\\<>;:\"`\[\]&?\s]/', $_POST['Value'])) |
|
| 33 | 33 | exit('<pre><'.$_POST['Value'].'> contains invalid ASCII chars.</pre>'); |
| 34 | - switch ( $_POST['Value'] ) { |
|
| 34 | + switch ($_POST['Value']) { |
|
| 35 | 35 | case 'anonymous': |
| 36 | 36 | case 'anybody': |
| 37 | 37 | case 'anyone': |
| 38 | - case ( preg_match( '/^anyone@/',$_POST['Value']) == TRUE ): |
|
| 38 | + case (preg_match('/^anyone@/', $_POST['Value']) == TRUE): |
|
| 39 | 39 | exit('<pre><'.$_POST['Value'].'> is not allowed.</pre>'); |
| 40 | 40 | } |
| 41 | 41 | } |
@@ -51,10 +51,10 @@ discard block |
||
| 51 | 51 | openlog($tag, LOG_PID, $fac); |
| 52 | 52 | $user = username(); |
| 53 | 53 | |
| 54 | -if ( ($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE ) |
|
| 55 | - exit ('Connect Error (' . $mysqli->connect_errno . ') '. $mysqli->connect_error); |
|
| 54 | +if (($mysqli = myConnect($dbhost, $userdb, $pwd, $db, $dbport, $tables, $_, $user)) === FALSE) |
|
| 55 | + exit ('Connect Error ('.$mysqli->connect_errno.') '.$mysqli->connect_error); |
|
| 56 | 56 | |
| 57 | -rlookup($mysqli,username(),$admins,$_POST['Value'],$_POST['genere'],$tables); |
|
| 57 | +rlookup($mysqli, username(), $admins, $_POST['Value'], $_POST['genere'], $tables); |
|
| 58 | 58 | $mysqli->close(); |
| 59 | 59 | closelog(); |
| 60 | 60 | ?> |
@@ -1,16 +1,16 @@ discard block |
||
| 1 | 1 | #!/usr/bin/php |
| 2 | 2 | <?php |
| 3 | 3 | /* Config */ |
| 4 | -$path='/var/www/html/RBL/'; |
|
| 4 | +$path = '/var/www/html/RBL/'; |
|
| 5 | 5 | include_once($path.'config.php'); |
| 6 | 6 | require_once($path.'function.php'); |
| 7 | -if ( !isset($version) ) { |
|
| 7 | +if (!isset($version)) { |
|
| 8 | 8 | openlog('myRBLemergency', LOG_PID, LOG_LOCAL0); |
| 9 | - syslog (LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?'); |
|
| 9 | + syslog(LOG_EMERG, 'unknown: I can\'t read the config files. Do you have configured the $path in getip.php?'); |
|
| 10 | 10 | closelog(); |
| 11 | 11 | exit(255); |
| 12 | 12 | } |
| 13 | -include_once(dirname(__FILE__) . '/function.php'); |
|
| 13 | +include_once(dirname(__FILE__).'/function.php'); |
|
| 14 | 14 | $conf = parse_ini_file($confImap_file, TRUE, INI_SCANNER_TYPED); |
| 15 | 15 | |
| 16 | 16 | |
@@ -19,8 +19,8 @@ discard block |
||
| 19 | 19 | openlog($tag, LOG_PID, $fac); |
| 20 | 20 | |
| 21 | 21 | |
| 22 | -if ( !$imapListActive ) { |
|
| 23 | - syslog (LOG_INFO, $conf['syslog']['user'].': This plugin isn\'t active.'); |
|
| 22 | +if (!$imapListActive) { |
|
| 23 | + syslog(LOG_INFO, $conf['syslog']['user'].': This plugin isn\'t active.'); |
|
| 24 | 24 | closelog(); |
| 25 | 25 | exit(255); |
| 26 | 26 | } |
@@ -31,50 +31,50 @@ discard block |
||
| 31 | 31 | $arr_tpl_data = array(date("Y-m-d", time())); |
| 32 | 32 | |
| 33 | 33 | /* Start of check list */ |
| 34 | -if ( !$conf['listingip']['onlyReport']['spam'] ) { |
|
| 34 | +if (!$conf['listingip']['onlyReport']['spam']) { |
|
| 35 | 35 | |
| 36 | 36 | /* check you select a right list */ |
| 37 | - if ( !$tables[$conf['listingip']['list']['spam']]['bl'] ) { |
|
| 37 | + if (!$tables[$conf['listingip']['list']['spam']]['bl']) { |
|
| 38 | 38 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spammer? I refuse to continue.'); |
| 39 | 39 | exit (254); |
| 40 | 40 | } |
| 41 | - if ( !$tables[$conf['listingip']['list']['spam']]['active'] ) { |
|
| 41 | + if (!$tables[$conf['listingip']['list']['spam']]['active']) { |
|
| 42 | 42 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['spam'].'> is not active. Please, activate it to continue with this process.'); |
| 43 | 43 | exit (254); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | -if ( !$conf['listingip']['onlyReport']['ham'] ) { |
|
| 48 | - if ( $tables[$conf['listingip']['list']['ham']]['bl'] ) { |
|
| 47 | +if (!$conf['listingip']['onlyReport']['ham']) { |
|
| 48 | + if ($tables[$conf['listingip']['list']['ham']]['bl']) { |
|
| 49 | 49 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.'); |
| 50 | 50 | exit (254); |
| 51 | 51 | } |
| 52 | - if ( !$tables[$conf['listingip']['list']['ham']]['active'] ) { |
|
| 52 | + if (!$tables[$conf['listingip']['list']['ham']]['active']) { |
|
| 53 | 53 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingip']['list']['ham'].'> is not active. Please, activate it |
| 54 | 54 | to continue with this process.'); |
| 55 | 55 | exit (254); |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | -if ( !$conf['listingdom']['onlyReport']['spam'] ) { |
|
| 59 | +if (!$conf['listingdom']['onlyReport']['spam']) { |
|
| 60 | 60 | |
| 61 | 61 | /* check you select a right list */ |
| 62 | - if ( !$tables[$conf['listingdom']['list']['spam']]['bl'] ) { |
|
| 62 | + if (!$tables[$conf['listingdom']['list']['spam']]['bl']) { |
|
| 63 | 63 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not a blocklist. Are you stupid? Do you want to whitelist a spam domain? I refuse to continue.'); |
| 64 | 64 | exit (254); |
| 65 | 65 | } |
| 66 | - if ( !$tables[$conf['listingdom']['list']['spam']]['active'] ) { |
|
| 66 | + if (!$tables[$conf['listingdom']['list']['spam']]['active']) { |
|
| 67 | 67 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['spam'].'> is not active. Please, activate it to continue with this process.'); |
| 68 | 68 | exit (254); |
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | -if ( !$conf['listingdom']['onlyReport']['ham'] ) { |
|
| 73 | - if ( $tables[$conf['listingdom']['list']['ham']]['bl'] ) { |
|
| 72 | +if (!$conf['listingdom']['onlyReport']['ham']) { |
|
| 73 | + if ($tables[$conf['listingdom']['list']['ham']]['bl']) { |
|
| 74 | 74 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is a blocklist. Are you stupid? Do you want to block a legitimate sender? I refuse to continue.'); |
| 75 | 75 | exit (254); |
| 76 | 76 | } |
| 77 | - if ( !$tables[$conf['listingdom']['list']['ham']]['active'] ) { |
|
| 77 | + if (!$tables[$conf['listingdom']['list']['ham']]['active']) { |
|
| 78 | 78 | syslog(LOG_EMERG, $conf['syslog']['user'].': <'.$conf['listingdom']['list']['ham'].'> is not active. Please, activate it |
| 79 | 79 | to continue with this process.'); |
| 80 | 80 | exit (254); |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | /* End of check list */ |
| 85 | 85 | |
| 86 | 86 | /* Make MYSQL connection Array */ |
| 87 | -$mysqlconf= array( |
|
| 87 | +$mysqlconf = array( |
|
| 88 | 88 | 'dbhost' => $dbhost, |
| 89 | 89 | 'userdb' => $userdb, |
| 90 | 90 | 'pwd' => $pwd, |
@@ -101,14 +101,14 @@ discard block |
||
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | /* The hard work has hidden in imapReport */ |
| 104 | -$learnfromArray = array('ham','spam'); |
|
| 105 | -foreach ( $learnfromArray as $learnfrom ) { |
|
| 104 | +$learnfromArray = array('ham', 'spam'); |
|
| 105 | +foreach ($learnfromArray as $learnfrom) { |
|
| 106 | 106 | $conf['report']['reportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['reportFile']["$learnfrom"]); |
| 107 | 107 | $conf['report']['badreportFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['badreportFile']["$learnfrom"]); |
| 108 | 108 | $conf['report']['reportDomFile']["$learnfrom"] = str_replace($arr_tpl_vars, $arr_tpl_data, $conf['report']['reportDomFile']["$learnfrom"]); |
| 109 | - imapReport ($conf,$mysqlconf,$splservice,$tables,$learnfrom); |
|
| 109 | + imapReport($conf, $mysqlconf, $splservice, $tables, $learnfrom); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | -syslog (LOG_INFO, $conf['syslog']['user'].': End of session.'); |
|
| 112 | +syslog(LOG_INFO, $conf['syslog']['user'].': End of session.'); |
|
| 113 | 113 | closelog(); |
| 114 | 114 | ?> |
@@ -1,5 +1,5 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | -function getIP($header,$mxserver,$msa) { |
|
| 2 | +function getIP($header, $mxserver, $msa) { |
|
| 3 | 3 | /* Get submission server's IP from header's mail */ |
| 4 | 4 | /* Each line must end with /r/n */ |
| 5 | 5 | /* IP is the first one written by your mxserver */ |
@@ -7,10 +7,10 @@ discard block |
||
| 7 | 7 | $ip = FALSE; |
| 8 | 8 | $host = FALSE; |
| 9 | 9 | $dateR = FALSE; |
| 10 | - if ( preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m',$header,$received) ) { |
|
| 11 | - for ($i = count($received[0])-1;$i>=0;$i--) { |
|
| 10 | + if (preg_match_all('/^Received:\sfrom(?:.|\r\n\s)*?[\[\(]\s*(?P<ip>\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})[\]\)](?:.|\r\n\s)+\s+by(?:\s|\r\n\s+)(?P<host>\S+).*(?:\s|\r\n\s\s)+.*;\s+(?P<date>.*)/m', $header, $received)) { |
|
| 11 | + for ($i = count($received[0])-1; $i>=0; $i--) { |
|
| 12 | 12 | # print "Examine ".$received[0][$i]."\n"; |
| 13 | - if ( preg_match($msa,$received['host'][$i]) ) |
|
| 13 | + if (preg_match($msa, $received['host'][$i])) |
|
| 14 | 14 | $dateR = $received['date'][$i]; |
| 15 | 15 | foreach ($mxserver as $mx) { |
| 16 | 16 | if (!$ip) |
@@ -21,38 +21,38 @@ discard block |
||
| 21 | 21 | } |
| 22 | 22 | } |
| 23 | 23 | } |
| 24 | - if ( preg_match ('/\r\nDate:\s(?P<date>.*)\r\n/',$header,$dateC) != 1) |
|
| 24 | + if (preg_match('/\r\nDate:\s(?P<date>.*)\r\n/', $header, $dateC) != 1) |
|
| 25 | 25 | $dateC['date'] = 'Not found'; |
| 26 | - if ( preg_match ('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/',$header,$mid) != 1) |
|
| 26 | + if (preg_match('/\r\nMessage\-I(?:D|d):\s(?P<mid>.*)\r\n/', $header, $mid) != 1) |
|
| 27 | 27 | $mid['mid'] = NULL; |
| 28 | - return array($ip,$host,$dateR,$dateC['date'],$mid['mid']); |
|
| 28 | + return array($ip, $host, $dateR, $dateC['date'], $mid['mid']); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | -function updateReport ($ip,$uid,$ipcount,$uidcount,$hostname,$dateC,$msgid,$dateL) { |
|
| 31 | +function updateReport($ip, $uid, $ipcount, $uidcount, $hostname, $dateC, $msgid, $dateL) { |
|
| 32 | 32 | |
| 33 | - return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n",$dateL,$dateC,$uid,$ip,$uidcount,$ipcount,$hostname,htmlentities($msgid) ); |
|
| 33 | + return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td>%u</td><td>%u</td><td>%s</td><td>%s</td></tr>'."\n", $dateL, $dateC, $uid, $ip, $uidcount, $ipcount, $hostname, htmlentities($msgid)); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | -function updatebadReport ( $uid,$dateC,$msgid,$dateL,$text ) { |
|
| 37 | - return sprintf ('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n",$dateL,$dateC,$uid,htmlentities($msgid),$text ); |
|
| 36 | +function updatebadReport($uid, $dateC, $msgid, $dateL, $text) { |
|
| 37 | + return sprintf('<tr><td nowrap>%s</td><td nowrap>%s</td><td>%s</td><td>%s</td><td nowrap>%s</td></tr>'."\n", $dateL, $dateC, $uid, htmlentities($msgid), $text); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | |
| 41 | -function summaryBadReport ($uidvet) { |
|
| 41 | +function summaryBadReport($uidvet) { |
|
| 42 | 42 | $nuid = $uidvet['count']; |
| 43 | - if ( empty($uidvet) ) return NULL; |
|
| 43 | + if (empty($uidvet)) return NULL; |
|
| 44 | 44 | $return = '<hr><h3>Statistics by UID</h3><table><tr><th>UID</th><th>Learned times</th></tr>'."\n"; |
| 45 | 45 | |
| 46 | 46 | /* Remove count index */ |
| 47 | 47 | $uids = array_keys($uidvet['uid']); |
| 48 | 48 | $totlearn = 0; |
| 49 | 49 | |
| 50 | - foreach ( $uids as $uid ) { |
|
| 51 | - $totlearn += $uidvet['uid']["$uid"]['count'];; |
|
| 52 | - $return .= sprintf ('<tr><td>%s</td><td>%u</td></tr>',$uid,$uidvet['uid']["$uid"]['count']); |
|
| 50 | + foreach ($uids as $uid) { |
|
| 51 | + $totlearn += $uidvet['uid']["$uid"]['count']; ; |
|
| 52 | + $return .= sprintf('<tr><td>%s</td><td>%u</td></tr>', $uid, $uidvet['uid']["$uid"]['count']); |
|
| 53 | 53 | } |
| 54 | - $return .= sprintf ('<tr><th>%s</th><th>%u</th></tr></table>','TOT',$totlearn); |
|
| 55 | - $return .= sprintf ('<p>%s : %u</p>','Unique UID',$nuid); |
|
| 54 | + $return .= sprintf('<tr><th>%s</th><th>%u</th></tr></table>', 'TOT', $totlearn); |
|
| 55 | + $return .= sprintf('<p>%s : %u</p>', 'Unique UID', $nuid); |
|
| 56 | 56 | |
| 57 | 57 | return $return; |
| 58 | 58 | } |
@@ -69,12 +69,12 @@ discard block |
||
| 69 | 69 | foreach ($cols as $col => $order) { |
| 70 | 70 | $eval .= '$colarr[\''.$col.'\'],'.$order.','; |
| 71 | 71 | } |
| 72 | - $eval = substr($eval,0,-1).');'; |
|
| 72 | + $eval = substr($eval, 0, -1).');'; |
|
| 73 | 73 | eval($eval); |
| 74 | 74 | $ret = array(); |
| 75 | 75 | foreach ($colarr as $col => $arr) { |
| 76 | 76 | foreach ($arr as $k => $v) { |
| 77 | - $k = substr($k,1); |
|
| 77 | + $k = substr($k, 1); |
|
| 78 | 78 | if (!isset($ret[$k])) $ret[$k] = $array[$k]; |
| 79 | 79 | if (isset ($array[$k][$col])) $ret[$k][$col] = $array[$k][$col]; |
| 80 | 80 | } |
@@ -84,33 +84,33 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | |
| 87 | -function summaryReportAndList ($cf,$myconn,$tables,$category,$vet,$key) { |
|
| 87 | +function summaryReportAndList($cf, $myconn, $tables, $category, $vet, $key) { |
|
| 88 | 88 | $nk = $vet['count']; |
| 89 | 89 | |
| 90 | - if ( empty($vet) ) return NULL; |
|
| 90 | + if (empty($vet)) return NULL; |
|
| 91 | 91 | |
| 92 | - $return = sprintf('<h3>Statistics by %s</h3><table><tr><th>%s</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this %s is currently listed, but it says if this %s has listed now!">Listed Now</th></tr>'."\n", strtoupper($key),strtoupper($key),$key,$key); |
|
| 92 | + $return = sprintf('<h3>Statistics by %s</h3><table><tr><th>%s</th><th>Learned by</th><th>Learned times</th><th title="This field doesn\'t say if this %s is currently listed, but it says if this %s has listed now!">Listed Now</th></tr>'."\n", strtoupper($key), strtoupper($key), $key, $key); |
|
| 93 | 93 | |
| 94 | 94 | $values = array_keys($vet["$key"]); |
| 95 | 95 | |
| 96 | - foreach ( $values as $value ) { |
|
| 97 | - if ( $value == 'count' ) continue; |
|
| 96 | + foreach ($values as $value) { |
|
| 97 | + if ($value == 'count') continue; |
|
| 98 | 98 | $nlearn = $vet["$key"]["$value"]['count']; |
| 99 | 99 | unset($vet["$key"]["$value"]['count']); |
| 100 | 100 | $quantity = $cf["listing$key"]['quantity']["$category"]; /* In searchAndList this value is |
| 101 | 101 | passed by reference and modified */ |
| 102 | 102 | $nuid = count($vet["$key"]["$value"]); |
| 103 | - if ( !$cf["listing$key"]['onlyReport']["$category"] ) { |
|
| 104 | - if ( ($nlearn >= $cf["listing$key"]['threshold']["$category"])&&($nuid >= $cf["listing$key"]['thresholduid']["$category"]) ) { |
|
| 103 | + if (!$cf["listing$key"]['onlyReport']["$category"]) { |
|
| 104 | + if (($nlearn>=$cf["listing$key"]['threshold']["$category"]) && ($nuid>=$cf["listing$key"]['thresholduid']["$category"])) { |
|
| 105 | 105 | $reason = sprintf( |
| 106 | 106 | 'The %s <%s> has been listed because was marked %u times as %s by %u different accounts during last %u days.', |
| 107 | - strtoupper($key),$value,$nlearn,$category,$nuid,$cf['imap']['oldestday']); |
|
| 108 | - $listed = searchAndList ($myconn,$cf['syslog']['user'],$tables,$cf["listing$key"]['list']["$category"],$value,$cf["listing$key"]['unit']["$category"],$quantity,$reason); |
|
| 107 | + strtoupper($key), $value, $nlearn, $category, $nuid, $cf['imap']['oldestday']); |
|
| 108 | + $listed = searchAndList($myconn, $cf['syslog']['user'], $tables, $cf["listing$key"]['list']["$category"], $value, $cf["listing$key"]['unit']["$category"], $quantity, $reason); |
|
| 109 | 109 | } |
| 110 | 110 | else $listed = FALSE; |
| 111 | 111 | } |
| 112 | 112 | else $listed = FALSE; |
| 113 | - $nowlist = array( TRUE => array( |
|
| 113 | + $nowlist = array(TRUE => array( |
|
| 114 | 114 | 'style' => 'id=\'ipfound\'', |
| 115 | 115 | 'name' => 'YES', |
| 116 | 116 | ), |
@@ -124,46 +124,46 @@ discard block |
||
| 124 | 124 | ) |
| 125 | 125 | ); |
| 126 | 126 | |
| 127 | - $return .='<tr><td rowspan="'.$nuid.'">'.$value.'</td>'; |
|
| 128 | - $return .= sprintf ('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>',$vet["$key"]["$value"][0],$nlearn,$nowlist["$listed"]['name']); |
|
| 129 | - $rowuid=NULL; |
|
| 130 | - for ($j=1;$j<$nuid;$j++) $rowuid .= '<tr><td>%s</td></tr>'; |
|
| 127 | + $return .= '<tr><td rowspan="'.$nuid.'">'.$value.'</td>'; |
|
| 128 | + $return .= sprintf('<td>%s</td><td rowspan="'.$nuid.'">%u</td><td rowspan="'.$nuid.'" '.$nowlist["$listed"]['style'].'>%s</td></tr>', $vet["$key"]["$value"][0], $nlearn, $nowlist["$listed"]['name']); |
|
| 129 | + $rowuid = NULL; |
|
| 130 | + for ($j = 1; $j<$nuid; $j++) $rowuid .= '<tr><td>%s</td></tr>'; |
|
| 131 | 131 | array_shift($vet["$key"]["$value"]); |
| 132 | - $return .= vsprintf ($rowuid,$vet["$key"]["$value"]); |
|
| 132 | + $return .= vsprintf($rowuid, $vet["$key"]["$value"]); |
|
| 133 | 133 | |
| 134 | 134 | } |
| 135 | - $return .= sprintf ('<tr><th title="unique %s">%u</th><th title="unique uids">%u</th><th>%u</th></table>',$key,$vet["$key"]['count'],$vet['uid']['count'],$nk); |
|
| 135 | + $return .= sprintf('<tr><th title="unique %s">%u</th><th title="unique uids">%u</th><th>%u</th></table>', $key, $vet["$key"]['count'], $vet['uid']['count'], $nk); |
|
| 136 | 136 | |
| 137 | 137 | |
| 138 | 138 | /* Statistics by UID */ |
| 139 | 139 | /* Not used for listing purpose, but useful to you! */ |
| 140 | - $return .= sprintf('<h3>Statistics by UID</h3><table><tr><th>UID</th><th>%s learned</th><th>Learned times</th></tr>'."\n",$key); |
|
| 140 | + $return .= sprintf('<h3>Statistics by UID</h3><table><tr><th>UID</th><th>%s learned</th><th>Learned times</th></tr>'."\n", $key); |
|
| 141 | 141 | $uids = array_keys($vet['uid']); |
| 142 | - foreach ( $uids as $uid ) { |
|
| 143 | - if ( $uid == 'count' ) continue; |
|
| 142 | + foreach ($uids as $uid) { |
|
| 143 | + if ($uid == 'count') continue; |
|
| 144 | 144 | $nlearn = $vet['uid']["$uid"]['count']; |
| 145 | - unset ( $vet['uid']["$uid"]['count'] ); |
|
| 145 | + unset ($vet['uid']["$uid"]['count']); |
|
| 146 | 146 | $nip = count($vet['uid']["$uid"]); |
| 147 | - $return .='<tr><td rowspan="'.$nip.'">'.$uid.'</td>'; |
|
| 148 | - $return .= sprintf ('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>',$vet['uid']["$uid"][0],$nlearn); |
|
| 149 | - $rowuid=NULL; |
|
| 150 | - for ($j=1;$j<$nip;$j++) $rowuid .= '<tr><td>%s</td></tr>'; |
|
| 147 | + $return .= '<tr><td rowspan="'.$nip.'">'.$uid.'</td>'; |
|
| 148 | + $return .= sprintf('<td>%s</td><td rowspan="'.$nip.'">%u</td></tr>', $vet['uid']["$uid"][0], $nlearn); |
|
| 149 | + $rowuid = NULL; |
|
| 150 | + for ($j = 1; $j<$nip; $j++) $rowuid .= '<tr><td>%s</td></tr>'; |
|
| 151 | 151 | array_shift($vet['uid']["$uid"]); |
| 152 | - $return .= vsprintf ($rowuid,$vet['uid']["$uid"]); |
|
| 152 | + $return .= vsprintf($rowuid, $vet['uid']["$uid"]); |
|
| 153 | 153 | |
| 154 | 154 | } |
| 155 | - $return .= sprintf ('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>', |
|
| 156 | - $vet['uid']['count'],$key,$vet["$key"]['count'],$nk); |
|
| 155 | + $return .= sprintf('<tr><th title="unique uids">%u</th><th title="unique %s">%u</th><th>%u</th></table>', |
|
| 156 | + $vet['uid']['count'], $key, $vet["$key"]['count'], $nk); |
|
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | return $return; |
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | |
| 163 | -function splunksearch ($service,$message_id,$date) { |
|
| 163 | +function splunksearch($service, $message_id, $date) { |
|
| 164 | 164 | |
| 165 | 165 | // Run a blocking search |
| 166 | - $searchQueryBlocking = 'search (message_id="'. addslashes( $message_id ) . |
|
| 166 | + $searchQueryBlocking = 'search (message_id="'.addslashes($message_id). |
|
| 167 | 167 | '" OR sasl_username) | transaction message_id queue_id maxspan=3m maxpause=2m | search sasl_username message_id=* | table sasl_username'; |
| 168 | 168 | |
| 169 | 169 | /* Doesn't work on Splunk 6.6 for HTTP exceptions |
@@ -182,8 +182,8 @@ discard block |
||
| 182 | 182 | |
| 183 | 183 | // A one shot search |
| 184 | 184 | $searchParams = array( |
| 185 | - 'earliest_time' => date("c",strtotime ($date)-120), |
|
| 186 | - 'latest_time' => date("c",strtotime ($date)+60) |
|
| 185 | + 'earliest_time' => date("c", strtotime($date)-120), |
|
| 186 | + 'latest_time' => date("c", strtotime($date)+60) |
|
| 187 | 187 | ); |
| 188 | 188 | |
| 189 | 189 | // Run a oneshot search that returns the job's results |
@@ -197,7 +197,7 @@ discard block |
||
| 197 | 197 | { |
| 198 | 198 | // More than one field attribute returned by search |
| 199 | 199 | // You must redefine the search |
| 200 | - if ( count($result->getFieldNames()) > 1 ) return FALSE; |
|
| 200 | + if (count($result->getFieldNames())>1) return FALSE; |
|
| 201 | 201 | } |
| 202 | 202 | else if ($result instanceof Splunk_ResultsMessage) |
| 203 | 203 | { |
@@ -235,13 +235,13 @@ discard block |
||
| 235 | 235 | |
| 236 | 236 | function flattenParts($messageParts, $flattenedParts = array(), $prefix = '', $index = 1, $fullPrefix = true) { |
| 237 | 237 | |
| 238 | - foreach($messageParts as $part) { |
|
| 238 | + foreach ($messageParts as $part) { |
|
| 239 | 239 | $flattenedParts[$prefix.$index] = $part; |
| 240 | - if(isset($part->parts)) { |
|
| 241 | - if($part->type == 2) { |
|
| 240 | + if (isset($part->parts)) { |
|
| 241 | + if ($part->type == 2) { |
|
| 242 | 242 | $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.', 0, false); |
| 243 | 243 | } |
| 244 | - elseif($fullPrefix) { |
|
| 244 | + elseif ($fullPrefix) { |
|
| 245 | 245 | $flattenedParts = flattenParts($part->parts, $flattenedParts, $prefix.$index.'.'); |
| 246 | 246 | } |
| 247 | 247 | else { |
@@ -259,7 +259,7 @@ discard block |
||
| 259 | 259 | function getPart($connection, $messageNumber, $partNumber, $encoding) { |
| 260 | 260 | |
| 261 | 261 | $data = imap_fetchbody($connection, $messageNumber, $partNumber); |
| 262 | - switch($encoding) { |
|
| 262 | + switch ($encoding) { |
|
| 263 | 263 | case 0: return $data; // 7BIT |
| 264 | 264 | case 1: return $data; // 8BIT |
| 265 | 265 | case 2: return $data; // BINARY |
@@ -272,30 +272,30 @@ discard block |
||
| 272 | 272 | } |
| 273 | 273 | /***********************************/ |
| 274 | 274 | |
| 275 | -function getDomains ($text,$exclude) { |
|
| 275 | +function getDomains($text, $exclude) { |
|
| 276 | 276 | /* Pattern from https://mathiasbynens.be/demo/url-regex */ |
| 277 | 277 | /* Current choice: @gruber */ |
| 278 | 278 | $pattern = '#\b(([\w-]+://?|www[.])[^\s()<>]+(?:\([\w\d]+\)|([^[:punct:]\s]|/)))#iS'; |
| 279 | 279 | $ret = array(); |
| 280 | 280 | $num_found = preg_match_all($pattern, $text, $out); |
| 281 | - if ( ($num_found !== FALSE) && ($num_found>0) ) { |
|
| 281 | + if (($num_found !== FALSE) && ($num_found>0)) { |
|
| 282 | 282 | foreach ($out[0] as $url) { |
| 283 | - $dom=nsdom(parse_url($url, PHP_URL_HOST)); |
|
| 284 | - if (!( empty($dom) || in_array($dom,$exclude) )) |
|
| 283 | + $dom = nsdom(parse_url($url, PHP_URL_HOST)); |
|
| 284 | + if (!(empty($dom) || in_array($dom, $exclude))) |
|
| 285 | 285 | $ret[] = $dom; |
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | 288 | return array_values(array_unique($ret)); |
| 289 | 289 | } |
| 290 | 290 | |
| 291 | -function parseURL ($connection,$messageNumber, $exclusionList) { |
|
| 291 | +function parseURL($connection, $messageNumber, $exclusionList) { |
|
| 292 | 292 | $message = ''; |
| 293 | 293 | $structure = imap_fetchstructure($connection, $messageNumber); |
| 294 | 294 | if (isset($structure->parts)) { |
| 295 | 295 | $flattenedParts = flattenParts($structure->parts); |
| 296 | - foreach($flattenedParts as $partNumber => $part) { |
|
| 296 | + foreach ($flattenedParts as $partNumber => $part) { |
|
| 297 | 297 | |
| 298 | - switch($part->type) { |
|
| 298 | + switch ($part->type) { |
|
| 299 | 299 | |
| 300 | 300 | case 0: |
| 301 | 301 | // the HTML or plain text part of the email |
@@ -324,13 +324,13 @@ discard block |
||
| 324 | 324 | else |
| 325 | 325 | $message = getPart($connection, $messageNumber, 1, $structure->encoding); |
| 326 | 326 | |
| 327 | - if ( !empty($message) ) |
|
| 327 | + if (!empty($message)) |
|
| 328 | 328 | return getDomains($message, $exclusionList); |
| 329 | 329 | return array(); |
| 330 | 330 | } |
| 331 | 331 | |
| 332 | 332 | function humanKey($key) { |
| 333 | - switch($key) { |
|
| 333 | + switch ($key) { |
|
| 334 | 334 | case 'ip': |
| 335 | 335 | return 'ips'; |
| 336 | 336 | case 'dom': |
@@ -339,67 +339,67 @@ discard block |
||
| 339 | 339 | return $key; |
| 340 | 340 | } |
| 341 | 341 | |
| 342 | -function writeFileHeader($f,$conf,$key,$type,$rtime) { |
|
| 343 | - fwrite( $f, file_get_contents(dirname(__FILE__) . '/' . $conf['report']['reportTemplateHeader']) ); |
|
| 344 | - fwrite( $f,sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>',$type, strtoupper(humanKey($key)),$rtime) ); |
|
| 342 | +function writeFileHeader($f, $conf, $key, $type, $rtime) { |
|
| 343 | + fwrite($f, file_get_contents(dirname(__FILE__).'/'.$conf['report']['reportTemplateHeader'])); |
|
| 344 | + fwrite($f, sprintf('<h1> Report of %s %s</h1><h5>%s</h5><h2>Detailed Report</h2>', $type, strtoupper(humanKey($key)), $rtime)); |
|
| 345 | 345 | if ($conf["listing$key"]['onlyReport']["$type"]) { |
| 346 | - fwrite( $f,sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>', |
|
| 347 | - strtoupper(humanKey($key))) ); |
|
| 346 | + fwrite($f, sprintf('<p>None of the below %s have been listed because listing is not active in configuration.</p>', |
|
| 347 | + strtoupper(humanKey($key)))); |
|
| 348 | 348 | syslog(LOG_INFO, sprintf('%s: Report only for %s %s: no listing activated in configuration.', |
| 349 | - $conf['syslog']['user'],$type,humanKey($key)) |
|
| 349 | + $conf['syslog']['user'], $type, humanKey($key)) |
|
| 350 | 350 | ); |
| 351 | 351 | } |
| 352 | - fwrite( $f,sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>', |
|
| 353 | - strtoupper($key),strtoupper($key),strtoupper($key)) ); |
|
| 352 | + fwrite($f, sprintf('<table><tr><th title="taken from Received header" nowrap>Date of Learn</th><th title="taken from Date header" nowrap>Date of Write</th><th nowrap>UID</th><th nowrap>%s</th><th title="How many times this uid learns">#UID</th><th title="Number of times this learned %s appears in different mails">#%s</th><th nowrap>Received by</th><th>Message-Id</th></tr>', |
|
| 353 | + strtoupper($key), strtoupper($key), strtoupper($key))); |
|
| 354 | 354 | } |
| 355 | 355 | |
| 356 | 356 | |
| 357 | -function imapReport ($cf,$myconnArray,$splunkconn,$tables,$type) { |
|
| 358 | - $file = dirname(__FILE__) . '/' . $cf['report']['reportFile']["$type"]; |
|
| 359 | - $filed = dirname(__FILE__) . '/' . $cf['report']['reportDomFile']["$type"]; |
|
| 360 | - $fileb= dirname(__FILE__) . '/' . $cf['report']['badreportFile']["$type"]; |
|
| 361 | - $m_mail = imap_open('{'.$cf['imap']['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['imap']['authuser'].'}'.$cf['imap']['folder']["$type"], $cf['imap']['account'],$cf['imap']['authpassword'], OP_READONLY) |
|
| 362 | - or syslog (LOG_EMERG, $cf['syslog']['user'].': Error in IMAP connection to <'.$cf['imap']['mailhost'].'>: ' . imap_last_error()); |
|
| 363 | - if ( !$m_mail ) exit(254); |
|
| 357 | +function imapReport($cf, $myconnArray, $splunkconn, $tables, $type) { |
|
| 358 | + $file = dirname(__FILE__).'/'.$cf['report']['reportFile']["$type"]; |
|
| 359 | + $filed = dirname(__FILE__).'/'.$cf['report']['reportDomFile']["$type"]; |
|
| 360 | + $fileb = dirname(__FILE__).'/'.$cf['report']['badreportFile']["$type"]; |
|
| 361 | + $m_mail = imap_open('{'.$cf['imap']['mailhost'].':143/imap/novalidate-cert/authuser='.$cf['imap']['authuser'].'}'.$cf['imap']['folder']["$type"], $cf['imap']['account'], $cf['imap']['authpassword'], OP_READONLY) |
|
| 362 | + or syslog(LOG_EMERG, $cf['syslog']['user'].': Error in IMAP connection to <'.$cf['imap']['mailhost'].'>: '.imap_last_error()); |
|
| 363 | + if (!$m_mail) exit(254); |
|
| 364 | 364 | |
| 365 | 365 | |
| 366 | - syslog (LOG_INFO,$cf['syslog']['user'].': Successfully connected to <'.$cf['imap']['mailhost'].">; Reading $type messages of last ".$cf['imap']['oldestday'].' days...'); |
|
| 366 | + syslog(LOG_INFO, $cf['syslog']['user'].': Successfully connected to <'.$cf['imap']['mailhost'].">; Reading $type messages of last ".$cf['imap']['oldestday'].' days...'); |
|
| 367 | 367 | //get all messages |
| 368 | - $dateTh = date ( "d-M-Y", strToTime ( '-'.$cf['imap']['oldestday'].' days' ) ); |
|
| 369 | - $dateN = date ( "d-M-Y", strToTime ( "now" ) ); |
|
| 370 | - $m_search=imap_search ($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\"" ); |
|
| 368 | + $dateTh = date("d-M-Y", strToTime('-'.$cf['imap']['oldestday'].' days')); |
|
| 369 | + $dateN = date("d-M-Y", strToTime("now")); |
|
| 370 | + $m_search = imap_search($m_mail, "SINCE \"$dateTh\" BEFORE \"$dateN\""); |
|
| 371 | 371 | |
| 372 | 372 | // Order results starting from newest message |
| 373 | - if ( empty($m_search) ) { |
|
| 374 | - syslog (LOG_INFO,$cf['syslog']['user'].": No mail found in $type folder. No reports written for $type."); |
|
| 375 | - if ( $ierr = imap_errors() ) |
|
| 376 | - foreach ( $ierr as $thiserr ) |
|
| 377 | - syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr"); |
|
| 378 | - if ( $ierr = imap_alerts() ) |
|
| 379 | - foreach ( $ierr as $thiserr ) |
|
| 380 | - syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr"); |
|
| 381 | - imap_close( $m_mail ); |
|
| 382 | - if ( file_exists( $file ) ) unlink ($file); |
|
| 383 | - if ( file_exists( $filed ) ) unlink ($filed); |
|
| 384 | - if ( file_exists( $fileb ) ) unlink ($fileb); |
|
| 373 | + if (empty($m_search)) { |
|
| 374 | + syslog(LOG_INFO, $cf['syslog']['user'].": No mail found in $type folder. No reports written for $type."); |
|
| 375 | + if ($ierr = imap_errors()) |
|
| 376 | + foreach ($ierr as $thiserr) |
|
| 377 | + syslog(LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr"); |
|
| 378 | + if ($ierr = imap_alerts()) |
|
| 379 | + foreach ($ierr as $thiserr) |
|
| 380 | + syslog(LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr"); |
|
| 381 | + imap_close($m_mail); |
|
| 382 | + if (file_exists($file)) unlink($file); |
|
| 383 | + if (file_exists($filed)) unlink($filed); |
|
| 384 | + if (file_exists($fileb)) unlink($fileb); |
|
| 385 | 385 | return FALSE; |
| 386 | 386 | } |
| 387 | - $nmes = count ($m_search); |
|
| 388 | - syslog (LOG_INFO,$cf['syslog']['user'].": Found $nmes mail in $type folder."); |
|
| 387 | + $nmes = count($m_search); |
|
| 388 | + syslog(LOG_INFO, $cf['syslog']['user'].": Found $nmes mail in $type folder."); |
|
| 389 | 389 | if ($nmes>0) rsort($m_search); |
| 390 | 390 | |
| 391 | 391 | // Create report file |
| 392 | 392 | |
| 393 | 393 | $fp = fopen($file, 'w'); |
| 394 | - $fpd= fopen($filed, 'w'); |
|
| 395 | - $fpb= fopen($fileb, 'w'); |
|
| 396 | - $lastup = "Last Update: " . date ("d F Y H:i", time()); |
|
| 397 | - writeFileHeader($fp,$cf,'ip',$type,$lastup); |
|
| 398 | - writeFileHeader($fpd,$cf,'dom',$type,$lastup); |
|
| 394 | + $fpd = fopen($filed, 'w'); |
|
| 395 | + $fpb = fopen($fileb, 'w'); |
|
| 396 | + $lastup = "Last Update: ".date("d F Y H:i", time()); |
|
| 397 | + writeFileHeader($fp, $cf, 'ip', $type, $lastup); |
|
| 398 | + writeFileHeader($fpd, $cf, 'dom', $type, $lastup); |
|
| 399 | 399 | |
| 400 | - fwrite( $fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateHeader']) ); |
|
| 401 | - fwrite( $fpb,"<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>" ); |
|
| 402 | - fwrite( $fpb,'<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>' ); |
|
| 400 | + fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateHeader'])); |
|
| 401 | + fwrite($fpb, "<h1> Report of bad reported $type mails</h1><h5>$lastup</h5><h2>Detailed Report</h2>"); |
|
| 402 | + fwrite($fpb, '<table><tr><th title="taken from Received header" nowrap>Date Learn</th><th title="taken from Date header" nowrap>Date Received</th><th nowrap>UID</th><th>Message-Id</th><th title="Why is this a bad report?">Reason</th></tr>'); |
|
| 403 | 403 | |
| 404 | 404 | $ipuid = array(); |
| 405 | 405 | $ipuid['count'] = 0; |
@@ -423,105 +423,105 @@ discard block |
||
| 423 | 423 | //get imap header info for obj thang |
| 424 | 424 | //$headers = imap_headerinfo($m_mail, $onem); |
| 425 | 425 | //$head = imap_fetchheader($m_mail, $headers->Msgno); |
| 426 | - $head = imap_fetchheader($m_mail, $onem ); |
|
| 426 | + $head = imap_fetchheader($m_mail, $onem); |
|
| 427 | 427 | //$obj = imap_rfc822_parse_headers( $head); |
| 428 | 428 | |
| 429 | - list ($ip,$host,$dateReceived,$dateClient,$mid) = getIP( $head,$cf['mx_hostname']['mx'],$cf['msa']['msalearn'] ); |
|
| 429 | + list ($ip, $host, $dateReceived, $dateClient, $mid) = getIP($head, $cf['mx_hostname']['mx'], $cf['msa']['msalearn']); |
|
| 430 | 430 | if (empty($mid)) { |
| 431 | - $uid='NA'; |
|
| 432 | - syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving data for empty Message-ID."); |
|
| 433 | - } else { |
|
| 431 | + $uid = 'NA'; |
|
| 432 | + syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving data for empty Message-ID."); |
|
| 433 | + }else { |
|
| 434 | 434 | if ($dateReceived === FALSE) { |
| 435 | - $uid='unauthenticated'; |
|
| 436 | - syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA"); |
|
| 437 | - } else |
|
| 438 | - if ( !($uid = splunksearch ($splunkconn, trim($mid,'<>'), $dateReceived)) ) { |
|
| 439 | - syslog (LOG_ERR, $cf['syslog']['user'].": Error retrieving uid from Splunk log for $mid."); |
|
| 440 | - $uid='unknown'; |
|
| 435 | + $uid = 'unauthenticated'; |
|
| 436 | + syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving date for $mid. Maybe this mail was not submitted to Learner MSA"); |
|
| 437 | + }else |
|
| 438 | + if (!($uid = splunksearch($splunkconn, trim($mid, '<>'), $dateReceived))) { |
|
| 439 | + syslog(LOG_ERR, $cf['syslog']['user'].": Error retrieving uid from Splunk log for $mid."); |
|
| 440 | + $uid = 'unknown'; |
|
| 441 | 441 | } |
| 442 | 442 | } |
| 443 | 443 | |
| 444 | 444 | /* Extract domains url in body */ |
| 445 | - $domains = parseURL ($m_mail,$onem,$cf['listingdom']['exclude']); |
|
| 445 | + $domains = parseURL($m_mail, $onem, $cf['listingdom']['exclude']); |
|
| 446 | 446 | |
| 447 | 447 | /* Update count of each ip */ |
| 448 | - if ($host and ($uid!='NA') and ($uid!='unauthenticated') and ($uid!='unknown')) { /* IP is received by MX servers and learned by valid uid */ |
|
| 449 | - $ipuid['count']++; //number of right messages |
|
| 448 | + if ($host and ($uid != 'NA') and ($uid != 'unauthenticated') and ($uid != 'unknown')) { /* IP is received by MX servers and learned by valid uid */ |
|
| 449 | + $ipuid['count']++; //number of right messages |
|
| 450 | 450 | |
| 451 | - if (in_array($uid,array_keys($ipuid['uid']))) { |
|
| 452 | - $ipuid['uid']["$uid"]['count']++; //number of learn by this uid |
|
| 453 | - if (!in_array($ip,$ipuid['uid']["$uid"])) |
|
| 454 | - $ipuid['uid']["$uid"][]=$ip; //ips learned by this uid |
|
| 451 | + if (in_array($uid, array_keys($ipuid['uid']))) { |
|
| 452 | + $ipuid['uid']["$uid"]['count']++; //number of learn by this uid |
|
| 453 | + if (!in_array($ip, $ipuid['uid']["$uid"])) |
|
| 454 | + $ipuid['uid']["$uid"][] = $ip; //ips learned by this uid |
|
| 455 | 455 | } |
| 456 | 456 | else { |
| 457 | 457 | $ipuid['uid']["$uid"]['count'] = 1; |
| 458 | - $ipuid['uid']["$uid"][]=$ip; |
|
| 459 | - $ipuid['uid']['count']++; //number of unique uids |
|
| 458 | + $ipuid['uid']["$uid"][] = $ip; |
|
| 459 | + $ipuid['uid']['count']++; //number of unique uids |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | - if (in_array($ip,array_keys($ipuid['ip']))) { |
|
| 463 | - $ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages |
|
| 464 | - if (!in_array($uid,$ipuid['ip']["$ip"])) |
|
| 465 | - $ipuid['ip']["$ip"][]=$uid; //uids that learned this ip |
|
| 462 | + if (in_array($ip, array_keys($ipuid['ip']))) { |
|
| 463 | + $ipuid['ip']["$ip"]['count']++; //number of time this ip appears in different messages |
|
| 464 | + if (!in_array($uid, $ipuid['ip']["$ip"])) |
|
| 465 | + $ipuid['ip']["$ip"][] = $uid; //uids that learned this ip |
|
| 466 | 466 | } |
| 467 | 467 | else { |
| 468 | 468 | $ipuid['ip']["$ip"]['count'] = 1; |
| 469 | - $ipuid['ip']["$ip"][]=$uid; |
|
| 470 | - $ipuid['ip']['count']++; //number of unique ips |
|
| 469 | + $ipuid['ip']["$ip"][] = $uid; |
|
| 470 | + $ipuid['ip']['count']++; //number of unique ips |
|
| 471 | 471 | } |
| 472 | 472 | |
| 473 | 473 | foreach ($domains as $dom) { |
| 474 | 474 | $domuid['count']++; |
| 475 | - if (in_array($uid,array_keys($domuid['uid']))) { |
|
| 476 | - $domuid['uid']["$uid"]['count']++; //number of learn by this uid |
|
| 477 | - if (!in_array($dom,$domuid['uid']["$uid"])) |
|
| 478 | - $domuid['uid']["$uid"][]=$dom; //domains learned by this uid |
|
| 475 | + if (in_array($uid, array_keys($domuid['uid']))) { |
|
| 476 | + $domuid['uid']["$uid"]['count']++; //number of learn by this uid |
|
| 477 | + if (!in_array($dom, $domuid['uid']["$uid"])) |
|
| 478 | + $domuid['uid']["$uid"][] = $dom; //domains learned by this uid |
|
| 479 | 479 | } |
| 480 | 480 | else { |
| 481 | 481 | $domuid['uid']["$uid"]['count'] = 1; |
| 482 | - $domuid['uid']["$uid"][]=$dom; |
|
| 483 | - $domuid['uid']['count']++; //number of unique uids |
|
| 482 | + $domuid['uid']["$uid"][] = $dom; |
|
| 483 | + $domuid['uid']['count']++; //number of unique uids |
|
| 484 | 484 | } |
| 485 | 485 | |
| 486 | - if (in_array($dom,array_keys($domuid['dom']))) { |
|
| 487 | - $domuid['dom']["$dom"]['count']++; //number of learn with this domain |
|
| 488 | - if (!in_array($uid,$domuid['dom']["$dom"])) |
|
| 489 | - $domuid['dom']["$dom"][]=$uid; //uids that learned this domain |
|
| 486 | + if (in_array($dom, array_keys($domuid['dom']))) { |
|
| 487 | + $domuid['dom']["$dom"]['count']++; //number of learn with this domain |
|
| 488 | + if (!in_array($uid, $domuid['dom']["$dom"])) |
|
| 489 | + $domuid['dom']["$dom"][] = $uid; //uids that learned this domain |
|
| 490 | 490 | } |
| 491 | 491 | else { |
| 492 | 492 | $domuid['dom']["$dom"]['count'] = 1; |
| 493 | - $domuid['dom']["$dom"][]=$uid; |
|
| 494 | - $domuid['dom']['count']++; //number of unique domains |
|
| 493 | + $domuid['dom']["$dom"][] = $uid; |
|
| 494 | + $domuid['dom']['count']++; //number of unique domains |
|
| 495 | 495 | } |
| 496 | 496 | |
| 497 | 497 | fwrite($fpd, |
| 498 | - updateReport ( |
|
| 499 | - $dom,$uid,$domuid['dom']["$dom"]['count'], |
|
| 500 | - $domuid['uid']["$uid"]['count'],$host, |
|
| 501 | - $dateClient,$mid,$dateReceived |
|
| 498 | + updateReport( |
|
| 499 | + $dom, $uid, $domuid['dom']["$dom"]['count'], |
|
| 500 | + $domuid['uid']["$uid"]['count'], $host, |
|
| 501 | + $dateClient, $mid, $dateReceived |
|
| 502 | 502 | ) |
| 503 | 503 | ); |
| 504 | 504 | } |
| 505 | 505 | |
| 506 | 506 | /* Update HTML report */ |
| 507 | - fwrite($fp,updateReport ( $ip,$uid,$ipuid['ip']["$ip"]['count'],$ipuid['uid']["$uid"]['count'],$host,$dateClient,$mid,$dateReceived) ); |
|
| 507 | + fwrite($fp, updateReport($ip, $uid, $ipuid['ip']["$ip"]['count'], $ipuid['uid']["$uid"]['count'], $host, $dateClient, $mid, $dateReceived)); |
|
| 508 | 508 | } |
| 509 | 509 | else { /* Bad learn */ |
| 510 | 510 | |
| 511 | - if (in_array($uid,array_keys($uidbad['uid']))) |
|
| 512 | - $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid |
|
| 511 | + if (in_array($uid, array_keys($uidbad['uid']))) |
|
| 512 | + $uidbad['uid']["$uid"]['count']++; //number of bad learn by this uid |
|
| 513 | 513 | else { |
| 514 | 514 | $uidbad['uid']["$uid"]['count'] = 1; |
| 515 | - $uidbad['uid']["$uid"][]=$uid; |
|
| 516 | - $uidbad['count']++; //numeber of unique bad uids |
|
| 515 | + $uidbad['uid']["$uid"][] = $uid; |
|
| 516 | + $uidbad['count']++; //numeber of unique bad uids |
|
| 517 | 517 | } |
| 518 | 518 | /* The reason of bad report */ |
| 519 | 519 | if ($host === FALSE) $reason = 'This mail was not received by recognized MX host'; |
| 520 | 520 | if ($dateReceived === FALSE) $reason = 'This mail was not submitted to recognized MSA for learn'; |
| 521 | - if ($uid=='unknown') $reason = 'The uid of this mail was not found in splunk log'; |
|
| 521 | + if ($uid == 'unknown') $reason = 'The uid of this mail was not found in splunk log'; |
|
| 522 | 522 | if (!isset($reason)) $reason = '?'; |
| 523 | 523 | |
| 524 | - fwrite( $fpb,updatebadReport ( $uid,$dateClient,$mid,$dateReceived,$reason ) ); |
|
| 524 | + fwrite($fpb, updatebadReport($uid, $dateClient, $mid, $dateReceived, $reason)); |
|
| 525 | 525 | } |
| 526 | 526 | } |
| 527 | 527 | |
@@ -529,54 +529,54 @@ discard block |
||
| 529 | 529 | //close report file and mailbox |
| 530 | 530 | |
| 531 | 531 | /* Summary Report */ |
| 532 | - $ipuid['ip'] = array_msort( $ipuid['ip'], array('count'=>SORT_DESC) ); |
|
| 533 | - $ipuid['uid'] = array_msort( $ipuid['uid'], array('count'=>SORT_DESC) ); |
|
| 534 | - $domuid['dom'] = array_msort( $domuid['dom'], array('count'=>SORT_DESC) ); |
|
| 535 | - $domuid['uid'] = array_msort( $domuid['uid'], array('count'=>SORT_DESC) ); |
|
| 536 | - $uidbad['uid'] = array_msort( $uidbad['uid'], array('count'=>SORT_DESC) ); |
|
| 532 | + $ipuid['ip'] = array_msort($ipuid['ip'], array('count'=>SORT_DESC)); |
|
| 533 | + $ipuid['uid'] = array_msort($ipuid['uid'], array('count'=>SORT_DESC)); |
|
| 534 | + $domuid['dom'] = array_msort($domuid['dom'], array('count'=>SORT_DESC)); |
|
| 535 | + $domuid['uid'] = array_msort($domuid['uid'], array('count'=>SORT_DESC)); |
|
| 536 | + $uidbad['uid'] = array_msort($uidbad['uid'], array('count'=>SORT_DESC)); |
|
| 537 | 537 | |
| 538 | 538 | fwrite($fp, '</table>'); |
| 539 | 539 | fwrite($fpd, '</table>'); |
| 540 | - fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['listingip']['threshold']["$type"].' times from at least '.$cf['listingip']['thresholduid']["$type"].' different valid uids.</h5>' ); |
|
| 541 | - fwrite($fpd, '<hr><h2>Summary Report</h2><h5>Listing policy: domains must be learned at least '.$cf['listingdom']['threshold']["$type"].' times from at least '.$cf['listingdom']['thresholduid']["$type"].' different valid uids.</h5>' ); |
|
| 540 | + fwrite($fp, '<hr><h2>Summary Report</h2><h5>Listing policy: ip must be learned at least '.$cf['listingip']['threshold']["$type"].' times from at least '.$cf['listingip']['thresholduid']["$type"].' different valid uids.</h5>'); |
|
| 541 | + fwrite($fpd, '<hr><h2>Summary Report</h2><h5>Listing policy: domains must be learned at least '.$cf['listingdom']['threshold']["$type"].' times from at least '.$cf['listingdom']['thresholduid']["$type"].' different valid uids.</h5>'); |
|
| 542 | 542 | |
| 543 | 543 | /* Make MYSQL connection */ |
| 544 | - if ( $cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"] ) |
|
| 544 | + if ($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]) |
|
| 545 | 545 | $mysqli = NULL; |
| 546 | 546 | else { |
| 547 | 547 | $mysqli = new mysqli($myconnArray['dbhost'], $myconnArray['userdb'], $myconnArray['pwd'], $myconnArray['db'], $myconnArray['dbport']); |
| 548 | 548 | if ($mysqli->connect_error) { |
| 549 | - syslog (LOG_EMERG, $cf['syslog']['user'].': Connect Error (' . $mysqli->connect_errno . ') ' |
|
| 549 | + syslog(LOG_EMERG, $cf['syslog']['user'].': Connect Error ('.$mysqli->connect_errno.') ' |
|
| 550 | 550 | . $mysqli->connect_error); |
| 551 | 551 | exit (254); |
| 552 | 552 | } |
| 553 | - syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to ' . $mysqli->host_info) ; |
|
| 553 | + syslog(LOG_INFO, $cf['syslog']['user'].': Successfully mysql connected to '.$mysqli->host_info); |
|
| 554 | 554 | } |
| 555 | 555 | /***********************/ |
| 556 | 556 | |
| 557 | - fwrite($fp, summaryReportAndList ($cf,$mysqli,$tables,$type,$ipuid, 'ip') ); |
|
| 558 | - fwrite($fp,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter'])); |
|
| 557 | + fwrite($fp, summaryReportAndList($cf, $mysqli, $tables, $type, $ipuid, 'ip')); |
|
| 558 | + fwrite($fp, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter'])); |
|
| 559 | 559 | fclose($fp); |
| 560 | 560 | |
| 561 | - fwrite($fpd, summaryReportAndList ($cf,$mysqli,$tables,$type,$domuid, 'dom') ); |
|
| 562 | - fwrite($fpd,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter'])); |
|
| 561 | + fwrite($fpd, summaryReportAndList($cf, $mysqli, $tables, $type, $domuid, 'dom')); |
|
| 562 | + fwrite($fpd, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter'])); |
|
| 563 | 563 | fclose($fpd); |
| 564 | 564 | |
| 565 | - if ( !($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"]) ) |
|
| 565 | + if (!($cf['listingip']['onlyReport']["$type"] && $cf['listingdom']['onlyReport']["$type"])) |
|
| 566 | 566 | $mysqli->close(); |
| 567 | 567 | |
| 568 | 568 | fwrite($fpb, '</table>'); |
| 569 | - fwrite( $fpb,summaryBadReport( $uidbad ) ); |
|
| 570 | - fwrite($fpb,file_get_contents(dirname(__FILE__) . '/' . $cf['report']['reportTemplateFooter'])); |
|
| 569 | + fwrite($fpb, summaryBadReport($uidbad)); |
|
| 570 | + fwrite($fpb, file_get_contents(dirname(__FILE__).'/'.$cf['report']['reportTemplateFooter'])); |
|
| 571 | 571 | fclose($fpb); |
| 572 | - syslog (LOG_INFO,$cf['syslog']['user'].': Report files written. Listing job for '.$type.' terminated.'); |
|
| 573 | - |
|
| 574 | - if ( $ierr = imap_errors() ) |
|
| 575 | - foreach ( $ierr as $thiserr ) |
|
| 576 | - syslog (LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr"); |
|
| 577 | - if ( $ierr = imap_alerts() ) |
|
| 578 | - foreach ( $ierr as $thiserr ) |
|
| 579 | - syslog (LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr"); |
|
| 572 | + syslog(LOG_INFO, $cf['syslog']['user'].': Report files written. Listing job for '.$type.' terminated.'); |
|
| 573 | + |
|
| 574 | + if ($ierr = imap_errors()) |
|
| 575 | + foreach ($ierr as $thiserr) |
|
| 576 | + syslog(LOG_ERR, $cf['syslog']['user'].": IMAP Error: $thiserr"); |
|
| 577 | + if ($ierr = imap_alerts()) |
|
| 578 | + foreach ($ierr as $thiserr) |
|
| 579 | + syslog(LOG_ALERT, $cf['syslog']['user'].": IMAP Alert: $thiserr"); |
|
| 580 | 580 | imap_close($m_mail); |
| 581 | 581 | } |
| 582 | 582 | ?> |
