X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Fcron_ml_moderate.php;h=30ffde82aa819e8d42799c0af79b5f8c3ba74776;hb=7f12e3b4113791f3372f11572a205925d7bb6b97;hp=7642fdce144cca6238d7703e26b46164f31db5f2;hpb=08fa70684fd1332178cddb6b318151335fb4506c;p=platal.git diff --git a/bin/cron/cron_ml_moderate.php b/bin/cron/cron_ml_moderate.php index 7642fdc..30ffde8 100755 --- a/bin/cron/cron_ml_moderate.php +++ b/bin/cron/cron_ml_moderate.php @@ -22,6 +22,7 @@ require('./connect.db.inc.php'); ini_set('max_execution_time', '75'); +ini_set('memory_limit', '128M'); $sent_mails = 0; $handler = time(); @@ -55,12 +56,14 @@ while ($sent_mails < $globals->lists->max_mail_per_min $action = 1; /** 1 = ACCEPT **/ $subject = "Message accepté"; $append = "a été accepté par $prenom $nom.\n"; + $type = 'nonspam'; $count += count($mem) + count($own); break; case 'refuse': $action = 2; /** 2 = REJECT **/ $subject = "Message refusé"; $append = "a été refusé par $prenom $nom avec la raison :\n\n" . $reason; + $type = 'nonspam'; $count += count($own) + 1; break; case 'delete': @@ -69,11 +72,33 @@ while ($sent_mails < $globals->lists->max_mail_per_min $append = "a été supprimé par $prenom $nom.\n\n" . "Rappel: il ne faut utiliser cette opération " . "que dans le cas de spams ou de virus !\n"; + $type = 'spam'; $count += count($own); break; } - if ($client->handle_request($list, $mid, $action, $reason)) { + // if the mail was classified as Unsure, feed bogo + $raw_mail = html_entity_decode($client->get_pending_mail($list, $mid, 1)); + // search for the X-Spam-Flag header + $end_of_headers = strpos($raw_mail, "\r\n\r\n"); + if ($end_of_headers === false) { // sometimes headers are separated by \n + $end_of_headers = strpos($raw_mail, "\n\n"); + } + $x_spam_flag = ''; + if (preg_match('/^X-Spam-Flag: ([a-zA-Z]+), tests=bogofilter/m', substr($raw_mail, 0, $end_of_headers + 1), $matches)) { + $x_spam_flag = $matches[1]; + } + if ($x_spam_flag == 'Unsure') { + $mailer = new PlMailer(); + $mailer->addTo($type . '@' . $globals->mail->domain); + $mailer->setFrom('"' . $prenom . ' ' . $nom . '" mail->domain . '>'); + $mailer->setTxtBody($type . ' soumis par ' . $prenom . ' ' . $nom . ' via la modération de la liste ' . $list . '@' . $domain); + $mailer->addAttachment($raw_mail, 'message/rfc822', $type . '.mail', false); + $mailer->send(); + } + + // send feedback to the mailing list owners + if ($client->handle_request($list, $mid, $action, utf8_decode($reason))) { $sent_mails += $count; $texte = "le message suivant :\n\n" . " Auteur: {$mail['sender']}\n"